Merge branch 'master' of git://git1.somerandomnick.ano

7 files changed, 11 insertions, 5 deletions

diff --git a/db/udpmsg4/alice/@/.gitignore b/db/udpmsg4/alice/@/.gitignore
new file mode 100644
index 0000000..b19a917
--- /dev/null
+++ b/db/udpmsg4/alice/@/.gitignore
@@ -0,0 +1 @@
+temp.keys
diff --git a/db/udpmsg4/alice/@/default.key b/db/udpmsg4/alice/@/default.key
new file mode 100644
index 0000000..bb66046
--- /dev/null
+++ b/db/udpmsg4/alice/@/default.key
@@ -0,0 +1 @@
+056ae8888bee5a72e2eb7d79ea3555dc81326c96e89ed45f8fc1cdf64bdea30c
diff --git a/db/udpmsg4/alice/@/owner b/db/udpmsg4/alice/@/owner
new file mode 100644
index 0000000..095936c
--- /dev/null
+++ b/db/udpmsg4/alice/@/owner
@@ -0,0 +1 @@
+somerandomnick
diff --git a/db/udpmsg4/alice/@/path b/db/udpmsg4/alice/@/path
new file mode 100644
index 0000000..b213279
--- /dev/null
+++ b/db/udpmsg4/alice/@/path
@@ -0,0 +1 @@
+/alice
diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod
index d902cfb..f76ac33 100644
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@ -46,9 +46,9 @@ Z<><table>
 -->
  <tr><td>IRCZ<></td><td>L<CA|irc://client.thruhere.net/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
 <!--
- <tr><td>IRCZ<></td><td>L<SRN|irc://anortr.ucis.nl:8804/RendezVous></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)</td></tr>
+ <tr><td>IRCZ<></td><td>L<SRN|irc://anortr.ucis.nl:8804/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)</td></tr>
 -->
- <tr><td>IRCZ<></td><td>L<SRN (tor)|irc://2dmrunyyp6bp53th.onion/RendezVous></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)</td></tr>
+ <tr><td>IRCZ<></td><td>L<SRN (tor)|irc://2dmrunyyp6bp53th.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)</td></tr>
 <!--
  <tr><td>IRCZ<></td><td>L<SRN2|irc://anortr.ucis.nl:8806/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
 -->
@@ -127,7 +127,7 @@ Z<><table>
  <tr><td>IRCZ<></td><td>L<SRN (NewNickNetCloud)|irc://irc6.srn.ano:6667/anonet></td><td>L<SRN (NewNickNetCloud)|irc://1.0.27.120:6667/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
  <tr><td>IRCZ<></td><td>L<SRN (NewNickNet)|irc://irc3.srn.ano:6667/anonet></td><td>L<SRN (NewNickNet)|irc://1.0.27.111:6667/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
  <tr><td>IRCZ<></td><td>L<SRN (NickNet)|irc://irc4.srn.ano:6667/anonet></td><td>L<SRN (NickNet)|irc://1.0.27.114:6667/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
- <tr><td>IRCZ<></td><td>L<SRN|irc://irc.somerandomnick.ano:6667/RendezVous></td><td>L<SRN|irc://1.0.27.103:6667/RendezVous></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)</td></tr>
+ <tr><td>IRCZ<></td><td>L<SRN|irc://irc.somerandomnick.ano:6667/anonet></td><td>L<SRN|irc://1.0.27.103:6667/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)</td></tr>
  <!--<tr><td>IRCZ<></td><td>L<sevilNatas|irc://irc0.sevilnatas.ano:6667/anoNet></td><td>L<aaao|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname, SSL enabled)</td></tr>-->
  <tr><td>IRCZ<></td><td>L<sevilNatas|irc://irc0.sevilnatas.ano:6667/anonet></td><td></td><td>L<aaao|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname, SSL enabled)</td></tr>
 <!--
@@ -137,7 +137,7 @@ Z<><table>
  <tr><td>TelnetZ<></td><td>L<SRN|telnet://irc.somerandomnick.ano:2323/></td><td></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP and username, custom nickname)</td></tr>
  <tr><td>IRC<></td><td>L<d3v11|irc://irc.d3v11.ano:6667/></td><td></td><td>L<aaoa|irc:1.1.5.67:6667/> (Hidden IP and username, custom nickname)</td></tr>
  <tr><td>IRC<></td><td>L<whatis-theplan|irc://irc.whatis-theplan.ano:6667/></td><td></td><td>L<aaoa|irc:1.1.5.69:6667/> (Hidden IP and username, custom nickname)</td></tr>
- <tr><td>JabberZ<></td><td>irc.somerandomnick.ano (RendezVous MUC)</td><td></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
+ <tr><td>JabberZ<></td><td>irc.somerandomnick.ano (anonet MUC)</td><td></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
 </table>
 
 =end xhtml
diff --git a/doc/www.anonet2.org/public_pod/links.pod b/doc/www.anonet2.org/public_pod/links.pod
index 7e731be..00f43b4 100644
--- a/doc/www.anonet2.org/public_pod/links.pod
+++ b/doc/www.anonet2.org/public_pod/links.pod
@@ -4,6 +4,8 @@ Back to homepage - L<http://www.anonet2.org/>
 
 This is a collection of links that you may find interesting:
 
+20111009 - L<Chaos Computer Club analyzes government malware|http://ccc.de/en/updates/2011/staatstrojaner>
+
 20110902 - L<Apple Cries About Samsung and Motorola's Patent "Monopoly"|http://www.dailytech.com/Apple+Cries+About+Samsung+and+Motorolas+Patent+Monopoly/article22586.htm>
 
 20110902 - L<Apple Scores Meaningless Dutch Court Victory Against Samsung|http://www.osnews.com/story/25098/Apple_Scores_Meaningless_Dutch_Court_Victory_Against_Samsung>
diff --git a/doc/www.anonet2.org/public_pod/services.pod b/doc/www.anonet2.org/public_pod/services.pod
index 73eaf4e..2dbb5a3 100644
--- a/doc/www.anonet2.org/public_pod/services.pod
+++ b/doc/www.anonet2.org/public_pod/services.pod
@@ -76,7 +76,7 @@ DNS (Recursive: 1.0.27.38 & 1.3.3.64; TLD: 1.0.27.37 & 1.3.3.66; Root: 1.0.27.39
 
 =item *
 
-IRC (L<irc://1.3.3.7/anonet> or L<irc://irc.somerandomnick.ano/RendezVous>)
+IRC (L<irc://1.3.3.7/anonet> or L<irc://irc.somerandomnick.ano/anonet>)
 
 =item *