Mercurial > hg > anonet-resdb
changeset 981:0aa847a79036 draft
Merge branch 'master' of git://git1.srn.ano
| author | icann <icann@icann.ano> |
|---|---|
| date | Fri, 03 Aug 2012 08:20:42 +0000 |
| parents | b473e0174ec9 (current diff) 66af8a3db38c (diff) |
| children | 335e48445b40 |
| files | |
| diffstat | 13 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/as/1170/owner Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +talamon
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/01/07/cidr Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +1.1.7.0/24
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/01/07/owner Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +talamon
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/freenet/@/.gitignore Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +temp.keys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/freenet/@/default.key Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +2997782812501d79bd32f1dbaf7b4682ecfba0ec4241521f8dae474c823d1d0e
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/freenet/@/owner Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +SeekingFor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/freenet/@/path Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +/freenet
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/sfor/@/.gitignore Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +temp.keys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/sfor/@/default.key Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +27f91ab3cb1fd317499a1da5f8aaefea08e967784497f69e58e1b38570acc655
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/sfor/@/owner Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +SeekingFor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/sfor/@/path Fri Aug 03 08:20:42 2012 +0000 @@ -0,0 +1,1 @@ +/sfor
--- a/doc/www.anonet2.org/public_pod/index.htm Wed Aug 01 19:36:22 2012 +0100 +++ b/doc/www.anonet2.org/public_pod/index.htm Fri Aug 03 08:20:42 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>
--- a/doc/www.anonet2.org/public_pod/index.pod Wed Aug 01 19:36:22 2012 +0100 +++ b/doc/www.anonet2.org/public_pod/index.pod Fri Aug 03 08:20:42 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 (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>