diff options
| author | Nick <nick@somerandomnick.ano> | 2012-08-02 04:26:29 +0000 |
|---|---|---|
| committer | Nick <nick@somerandomnick.ano> | 2012-08-02 04:26:29 +0000 |
| commit | 88f2e39ff436024752e8a3bf85eafff9daa533fd (patch) | |
| tree | a0bd12222ef431346d2b58559e14508b19e5eb3b | |
| parent | 89a08760431978d3e29187c236ebecab174460df (diff) | |
| parent | 9517f0fa5019e195f9621977eada5eadf55636aa (diff) | |
| download | resdb-88f2e39ff436024752e8a3bf85eafff9daa533fd.tar.gz resdb-88f2e39ff436024752e8a3bf85eafff9daa533fd.zip | |
Merge git://1.1.7.1
| -rw-r--r-- | db/as/1170/owner | 1 | ||||
| -rw-r--r-- | db/ip/01/01/07/cidr | 1 | ||||
| -rw-r--r-- | db/ip/01/01/07/owner | 1 | ||||
| -rw-r--r-- | doc/www.anonet2.org/public_pod/index.htm | 1 | ||||
| -rw-r--r-- | doc/www.anonet2.org/public_pod/index.pod | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/db/as/1170/owner b/db/as/1170/owner new file mode 100644 index 0000000..672cd6e --- /dev/null +++ b/db/as/1170/owner @@ -0,0 +1 @@ +talamon diff --git a/db/ip/01/01/07/cidr b/db/ip/01/01/07/cidr new file mode 100644 index 0000000..8083f7b --- /dev/null +++ b/db/ip/01/01/07/cidr @@ -0,0 +1 @@ +1.1.7.0/24 diff --git a/db/ip/01/01/07/owner b/db/ip/01/01/07/owner new file mode 100644 index 0000000..672cd6e --- /dev/null +++ b/db/ip/01/01/07/owner @@ -0,0 +1 @@ +talamon diff --git a/doc/www.anonet2.org/public_pod/index.htm b/doc/www.anonet2.org/public_pod/index.htm index 2927461..1be36d2 100644 --- a/doc/www.anonet2.org/public_pod/index.htm +++ b/doc/www.anonet2.org/public_pod/index.htm @@ -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 --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod index c7fbe97..567fb7a 100644 --- a/doc/www.anonet2.org/public_pod/index.pod +++ b/doc/www.anonet2.org/public_pod/index.pod @@ -62,6 +62,7 @@ Z<><table> <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> |