# HG changeset patch
# User d3v11 <d3v11@d3v11.ano>
# Date 1316758119 18000
# Node ID 044ecd27175afc1f04664ab6ab521800ddac4bc2
# Parent  3309fccbde487593b0ba843e12904b646d7fefd2# Parent  947295560b710d6284d8df7ab00d86a7eee5fe1d
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r 3309fccbde48 -r 044ecd27175a db/as/156/owner
--- a/db/as/156/owner	Fri Sep 23 00:50:56 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-dimitry
diff -r 3309fccbde48 -r 044ecd27175a db/dom/ano/cococha/ns/ns1.cococha.ano
--- a/db/dom/ano/cococha/ns/ns1.cococha.ano	Fri Sep 23 00:50:56 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-1.155.156.53
diff -r 3309fccbde48 -r 044ecd27175a db/ip/01/9B/9B/ns/ns1.cococha.ano
diff -r 3309fccbde48 -r 044ecd27175a db/ip/01/9B/9C/cidr
--- a/db/ip/01/9B/9C/cidr	Fri Sep 23 00:50:56 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-1.155.156.0/24
diff -r 3309fccbde48 -r 044ecd27175a db/ip/01/9B/9C/ns/ns1.cococha.ano
diff -r 3309fccbde48 -r 044ecd27175a db/ip/01/9B/9C/ns/ns2.cococha.ano
diff -r 3309fccbde48 -r 044ecd27175a db/ip/01/9B/9C/owner
--- a/db/ip/01/9B/9C/owner	Fri Sep 23 00:50:56 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-dimitry
diff -r 3309fccbde48 -r 044ecd27175a db/udpmsg4/relayhell/@/default.key
--- a/db/udpmsg4/relayhell/@/default.key	Fri Sep 23 00:50:56 2011 -0500
+++ b/db/udpmsg4/relayhell/@/default.key	Fri Sep 23 01:08:39 2011 -0500
@@ -1,1 +1,1 @@
-ce1c4cc4ee1cedf0bcd00cff36d08dfbb9bad1f4df69c3225eb33e9301b1b144
+0fd27cd108d70a75c4e412d16d0fb33cdce0e254fc1fdfd70cc3f528b52ea72a
diff -r 3309fccbde48 -r 044ecd27175a doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Fri Sep 23 00:50:56 2011 -0500
+++ b/doc/www.anonet2.org/public_pod/index.pod	Fri Sep 23 01:08:39 2011 -0500
@@ -56,6 +56,7 @@
  <tr><td>IRCZ<></td><td>L<SRN3 (tor)|irc://elef7kcrczguvamt.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<SRN4 (tor)|irc://wllef6hh2mt6uoi4.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<SRN6 (tor)|irc://5ziqujry3yknhco2.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<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>
@@ -103,10 +104,6 @@
 
 =item *
 
-L<lex's lynx client port|http://lynx.vanet.org/ClientPort>, which also provides connectivity to IPv6 Anonet
-
-=item *
-
 It is possible to negotiate your first peering on IRC, completely
 bypassing the client port.  (For this option you can use quicktun,
 openvpn, or tinc.  You will also need routing software, for example bird
diff -r 3309fccbde48 -r 044ecd27175a doc/www.powerfulproxy.com/public_html/do_it.php
--- a/doc/www.powerfulproxy.com/public_html/do_it.php	Fri Sep 23 00:50:56 2011 -0500
+++ b/doc/www.powerfulproxy.com/public_html/do_it.php	Fri Sep 23 01:08:39 2011 -0500
@@ -30,9 +30,12 @@
 //	'@(src|href|action)\s*=\s*(\'|")/([^\'"]*)\2@i' => '$1=$2'.$SERVICEURL.$proto.'/'.$host.'/$3$2',
 	'@(<[^>]*)(src|href|action)\s*=\s*(\'|")/([^\'"]*)\3@i' => '$1$2=$3'.$SERVICEURL.$proto.'/'.$host.'/$4$3',
 );
-$CURL_OPTIONS = array(
-	CURLOPT_USERAGENT	=> "AnoNet proxy",
+if (file_exists("do_it.inc")) include "do_it.inc";
+if (!isset($CURL_OPTIONS)) $CURL_OPTIONS = array(
+//	CURLOPT_USERAGENT	=> "AnoNet proxy",
+	CURLOPT_USERAGENT	=> $_SERVER["HTTP_USER_AGENT"]." AnoNetProxy",
 	CURLOPT_AUTOREFERER	=> TRUE,
+	CURLOPT_REFERER		=> $_SERVER["HTTP_REFERER"],
 	CURLOPT_CONNECTTIMEOUT	=> 15,
 	CURLOPT_TIMEOUT		=> 28,
 	CURLOPT_MAXREDIRS	=> 10,
@@ -40,7 +43,7 @@
 	CURLOPT_HEADER		=> 1,
 	CURLOPT_FOLLOWLOCATION	=> FALSE,
 //	CURLOPT_INTERFACE	=> '0.0.0.0',
-//	CURLOPT_PROXY		=> "http://b.polipo.srn.ano:8000/",
+	CURLOPT_PROXY		=> "http://b.polipo.srn.ano:8000/",
 //	CURLOPT_PROXYUSERPWD	=> 'username:password',
 );
 /* END OF CONFIGURATION */