# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1331226606 0
# Node ID 4d0a57ebab5df00162bfc942878fec95df508cb9
# Parent  5bc6baf26bcdd588e1c9b4eb5bf1ee531c0003be# Parent  e000b7b59870347d13b8428f1f3a879986a798e1
Merge commit 'f701164e6bd1f1bc7ba59aab8f9ec382315df694'

diff -r e000b7b59870 -r 4d0a57ebab5d db/as/2012/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/2012/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+Severus_Snape
diff -r e000b7b59870 -r 4d0a57ebab5d db/as/420/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/420/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+d33vee8
diff -r e000b7b59870 -r 4d0a57ebab5d db/as/57005/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/57005/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+red
diff -r e000b7b59870 -r 4d0a57ebab5d db/as/992/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/992/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/cococha/ns/ns2.cococha.ano
--- a/db/dom/ano/cococha/ns/ns2.cococha.ano	Thu Mar 08 06:57:28 2012 +0000
+++ b/db/dom/ano/cococha/ns/ns2.cococha.ano	Thu Mar 08 17:10:06 2012 +0000
@@ -1,1 +1,1 @@
-1.155.155.1
+1.155.155.120
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/d33vee8/ns/a.ns.d33vee8.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/d33vee8/ns/a.ns.d33vee8.ano	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+1.4.2.5
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/d33vee8/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/d33vee8/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+d33vee8
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/ideanode/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/ideanode/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/ideanode/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/ideanode/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+Severus_Snape
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/red/ns/ns1.red.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/red/ns/ns1.red.ano	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+1.222.173.2
diff -r e000b7b59870 -r 4d0a57ebab5d db/dom/ano/red/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/red/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+red
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/04/02/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/04/02/cidr	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+1.4.2.0/24
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/04/02/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/04/02/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+d33vee8
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/05/05/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/05/05/cidr	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+1.5.5.0/24
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/05/05/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/05/05/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/C0/A8/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/C0/A8/cidr	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+1.192.168.0/24
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/C0/A8/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/C0/A8/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+Severus_Snape
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/DE/AD/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/DE/AD/cidr	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+1.222.173.0/24
diff -r e000b7b59870 -r 4d0a57ebab5d db/ip/01/DE/AD/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/DE/AD/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+red
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/A666/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A666/@/.gitignore	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/A666/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A666/@/default.key	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+6c231ab34012402bce793624047c2eddceab222d48f41c318d9e90078d5da33c
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/A666/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A666/@/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+pikaj00
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/A666/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A666/@/path	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+/A666
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/IdeaNode/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/.gitignore	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/IdeaNode/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/default.key	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+7bc6a71c6e407ab6ad9edddf8347d7a7558286c62f0848e2d0e2e7982e21bf68
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/IdeaNode/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/IdeaNode/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/path	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+/IdeaNode
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/anonsec/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/.gitignore	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/anonsec/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/default.key	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+d557e8670d5a2f50c6e9e496294f0d7f540e6e4a76eda27f879cabb347ffb00f
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/anonsec/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/anonsec/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/path	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+/anonsec
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cerberus/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/.gitignore	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cerberus/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/default.key	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+8d967666e3b00a17461deeb84b7c033cd32e9366c6b965d871b4dc469e408079
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cerberus/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+adorablelunatic
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cerberus/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/path	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+/cerberus
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cha/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/.gitignore	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cha/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/default.key	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+f252a3dd7ba44b76cd998ad0d22453d652682f47be6d6ea19039beaff00b801f
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cha/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+dimitry
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/cha/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/path	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+/cha
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/eagleits/@/.gitignore
--- a/db/udpmsg4/eagleits/@/.gitignore	Thu Mar 08 06:57:28 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-temp.keys
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/eagleits/@/default.key
--- a/db/udpmsg4/eagleits/@/default.key	Thu Mar 08 06:57:28 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-d557e8670d5a2f50c6e9e496294f0d7f540e6e4a76eda27f879cabb347ffb00f
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/eagleits/@/owner
--- a/db/udpmsg4/eagleits/@/owner	Thu Mar 08 06:57:28 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-somerandomnick
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/eagleits/@/path
--- a/db/udpmsg4/eagleits/@/path	Thu Mar 08 06:57:28 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/eagleits
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/voxanon/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/voxanon/@/.gitignore	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/voxanon/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/voxanon/@/default.key	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+0be91cbb76f9e102357211889f37e5ef6ae1b515e2d8c7b85b385d9ee71aee76
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/voxanon/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/voxanon/@/owner	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r e000b7b59870 -r 4d0a57ebab5d db/udpmsg4/voxanon/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/voxanon/@/path	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+/voxanon
diff -r e000b7b59870 -r 4d0a57ebab5d db/usr/Severus_Snape/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/Severus_Snape/git	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+git://1.192.168.1/
diff -r e000b7b59870 -r 4d0a57ebab5d db/usr/d33vee8/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/d33vee8/git	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+git://1.4.2.1/
diff -r e000b7b59870 -r 4d0a57ebab5d db/usr/dimitry/git
--- a/db/usr/dimitry/git	Thu Mar 08 06:57:28 2012 +0000
+++ b/db/usr/dimitry/git	Thu Mar 08 17:10:06 2012 +0000
@@ -1,1 +1,1 @@
-git://1.155.155.1/
+git://1.155.155.121/
diff -r e000b7b59870 -r 4d0a57ebab5d db/usr/red/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/red/git	Thu Mar 08 17:10:06 2012 +0000
@@ -0,0 +1,1 @@
+git://1.222.173.2/resdb
diff -r e000b7b59870 -r 4d0a57ebab5d doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Thu Mar 08 06:57:28 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Mar 08 17:10:06 2012 +0000
@@ -46,7 +46,8 @@
  <tr><td>HTTP WebChatZ<></td><td>L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname (note 1))</td></tr>
  <tr><td>HTTP WebChatZ<></td><td>L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet></td><td>L<naya|http://www.anonet2.org/irc_anonymity> (Visible IP, hidden username and realname, custom nickname (warning!) (note 1))</td></tr>
 -->
- <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<A666|irc://irc.anonet2.biz/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/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>
 -->
@@ -98,7 +99,7 @@
 
 =item *
 
-L<PIKAJ00 has a client port.|http://client.thruhere.net/> (You will
+L<www.anonet2.biz has a client port.|http://www.anonet2.biz/> (You will
 need openvpn for this option, but there is no need for routing software.)
 
 =item *