Mercurial > hg > anonet-resdb
changeset 667:cd36aa5c9b00 draft
Merge branch 'master' of git://git1.somerandomnick.ano
author | d3v11 <d3v11@d3v11.ano> |
---|---|
date | Sun, 09 Oct 2011 14:22:41 -0500 |
parents | 57f1b4308edd (current diff) 69c188832713 (diff) |
children | d76cc244e016 |
files | |
diffstat | 7 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/alice/@/.gitignore Sun Oct 09 14:22:41 2011 -0500 @@ -0,0 +1,1 @@ +temp.keys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/alice/@/default.key Sun Oct 09 14:22:41 2011 -0500 @@ -0,0 +1,1 @@ +056ae8888bee5a72e2eb7d79ea3555dc81326c96e89ed45f8fc1cdf64bdea30c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/alice/@/owner Sun Oct 09 14:22:41 2011 -0500 @@ -0,0 +1,1 @@ +somerandomnick
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/alice/@/path Sun Oct 09 14:22:41 2011 -0500 @@ -0,0 +1,1 @@ +/alice
--- a/doc/www.anonet2.org/public_pod/index.pod Sun Oct 09 13:16:30 2011 -0500 +++ b/doc/www.anonet2.org/public_pod/index.pod Sun Oct 09 14:22:41 2011 -0500 @@ -46,9 +46,9 @@ --> <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 @@ <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 @@ <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
--- a/doc/www.anonet2.org/public_pod/links.pod Sun Oct 09 13:16:30 2011 -0500 +++ b/doc/www.anonet2.org/public_pod/links.pod Sun Oct 09 14:22:41 2011 -0500 @@ -4,6 +4,8 @@ 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>
--- a/doc/www.anonet2.org/public_pod/services.pod Sun Oct 09 13:16:30 2011 -0500 +++ b/doc/www.anonet2.org/public_pod/services.pod Sun Oct 09 14:22:41 2011 -0500 @@ -76,7 +76,7 @@ =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 *