Merge branch 'bugfix/oftc_onion' into stable

config/chroot_local-includes/etc/skel/.purple/accounts.xml

@@ -29,7 +29,8 @@
 	</account>
 	<account>
 		<protocol>prpl-irc</protocol>
-		<name>XXX_NICK_XXX@irc.oftc.net</name>
+		<name>XXX_NICK_XXX@37lnq2veifl4kar7.onion</name>
+		<alias>XXX_NICK_XXX@OFTC</alias>
 		<statuses>
 			<status type='available' name='Available' active='true'>
 				<attributes/>
@@ -45,8 +46,8 @@
 			<setting name='username' type='string'>XXX_NICK_XXX</setting>
 			<setting name='encoding' type='string'>UTF-8,ISO-8859-1</setting>
 			<setting name='realname' type='string'>XXX_NICK_XXX</setting>
-			<setting name='port' type='int'>6697</setting>
-			<setting name='ssl' type='bool'>1</setting>
+			<setting name='port' type='int'>6667</setting>
+			<setting name='ssl' type='bool'>0</setting>
 		</settings>
 		<settings ui='gtk-gaim'>
 			<setting name='auto-login' type='bool'>1</setting>

config/chroot_local-includes/etc/skel/.purple/blist.xml

@@ -4,16 +4,16 @@
 	<blist>
 		<group name='Discussions'>
 			<setting name='collapsed' type='bool'>0</setting>
-			<chat proto='prpl-irc' account='XXX_NICK_XXX@irc.oftc.net'>
+			<chat proto='prpl-irc' account='XXX_NICK_XXX@37lnq2veifl4kar7.onion'>
 				<component name='channel'>#tails</component>
 			</chat>
-			<chat proto='prpl-irc' account='XXX_NICK_XXX@irc.oftc.net'>
+			<chat proto='prpl-irc' account='XXX_NICK_XXX@37lnq2veifl4kar7.onion'>
 				<component name='channel'>#tor</component>
 			</chat>
 		</group>
 	</blist>
 	<privacy>
 		<account proto='prpl-irc' name='XXX_NICK_XXX@irc.indymedia.org' mode='1'/>
-		<account proto='prpl-irc' name='XXX_NICK_XXX@irc.oftc.net' mode='1'/>
+		<account proto='prpl-irc' name='XXX_NICK_XXX@37lnq2veifl4kar7.onion' mode='1'/>
 	</privacy>
 </purple>