# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1343881589 0
# Node ID 31f385b787ab49c7b4c1fa73261fe1b2374051bb
# Parent  dd25621209512641ce1ce6b1c384447d9baad8e8# Parent  2197040ef7cbe1bc01b7d3213c4281dc5096dd74
Merge git://1.1.7.1

diff -r dd2562120951 -r 31f385b787ab db/as/1170/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/1170/owner	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+talamon
diff -r dd2562120951 -r 31f385b787ab db/ip/01/01/07/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/07/cidr	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+1.1.7.0/24
diff -r dd2562120951 -r 31f385b787ab db/ip/01/01/07/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/07/owner	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+talamon
diff -r dd2562120951 -r 31f385b787ab doc/www.anonet2.org/public_pod/index.htm
--- a/doc/www.anonet2.org/public_pod/index.htm	Thu Aug 02 01:41:14 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/index.htm	Thu Aug 02 04:26:29 2012 +0000
@@ -35,6 +35,7 @@
  <tr><td>IRC</td><td><a href="irc://irc.kwaaknet.org:6667/anonet">KwaakNet</a></td><td>Visible IP, username and realname (warning!)</td></tr>
  <tr><td>IRC</td><td><a href="irc://hlzfripz3yzsqsoz.onion:6667/">d3v11 (tor)</a></td><td>Hidden IP and username, custom nickname</td></tr>
  <tr><td>IRC</td><td><a href="irc://h7gg4wyz26iyjbcu.onion:6667/">whatis-theplan (tor)</a></td><td>Hidden IP and username, custom nickname</td></tr>
+ <tr><td>IRC</td><td><a href="irc://uvqqv4xu22vfkhg2.onion:6667/">NTMA</a></td><td>Hidden IP and username, custom nickname</td></tr>
  <tr><td>Telnet</td><td><a href="telnet://anortr.ucis.nl:8803/">SRN</a></td><td>Hidden IP and username, custom nickname</td></tr>
 </table>
 
diff -r dd2562120951 -r 31f385b787ab doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Thu Aug 02 01:41:14 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Aug 02 04:26:29 2012 +0000
@@ -62,6 +62,7 @@
  <tr><td>IRCZ<></td><td>L<SRN8 (tor)|irc://kvur4ogjijlvxsdm.onion/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<sevilNatas (tor)|irc://p4hej3mnyqdtxwiu.onion/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<d3v11 (tor)|irc://rbb3cizcd23x7w4g.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
+ <tr><td>IRCZ<></td><td>L<NTMA (tor)|irc://uvqqv4xu22vfkhg2.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname(note 2))</td></tr>
 <!--
  <tr><td>IRCZ<></td><td>L<UFO|irc://anortr.ucis.nl:8805/anonet></td><td>L<aooo|http://www.anonet2.org/irc_anonymity> (Hidden IP, visible username and realname)</td></tr>
  <tr><td>IRCZ<></td><td>L<UFO|irc://irc.kwaaknet.org:6667/anonet></td><td>L<nooo|http://www.anonet2.org/irc_anonymity> (Visible IP, username and realname (warning!))</td></tr>