Merge branch 'master' of git://1.0.27.102

3 files changed, 2 insertions, 13 deletions

diff --git a/contrib/tor2dns/tor2dns/README b/contrib/tor2dns/README
index 4379a98..5194c76 100644
--- a/contrib/tor2dns/tor2dns/README
+++ b/contrib/tor2dns/README
@@ -23,21 +23,10 @@ echo 'new dns link >>> http://'`cat /var/lib/tor/tor2dns/hostname`':8053'
 
 UPDATE:
 
-# pull a copy using tor 
-usewithtor wget http://nbafkr7odek2wh6r.onion/peer2anonet.tgz
-
 # pull a copy from AnoNet2
-wget http://d3v11.ano/peer2anonet.tgz
-
-
-POST INSTALL:
-	You will want to make sure port fowarding is turned on, on
-	port 8053 of your router, you may also need to adjust your
-	firewall. you can test for success by opening your browser
-	with tor enabled and going to the link given @ the end of
-	your installation. :-) enjoy.
+wget http://d3v11.ano/tor2dns.tgz
 
 NOTE:
 	On some systems /var/lib/tor/tor2dns will need a special owner
 	like "debian-tor". If tor2dns fails for you please troubleshoot
-	your logs, port fowarding, etc.
+	your logs.
diff --git a/contrib/tor2dns/tor2dns/run b/contrib/tor2dns/run
index 1e543a9..1e543a9 100755
--- a/contrib/tor2dns/tor2dns/run
+++ b/contrib/tor2dns/run
diff --git a/contrib/tor2dns/tor2dns/serve b/contrib/tor2dns/serve
index 0274b74..0274b74 100755
--- a/contrib/tor2dns/tor2dns/serve
+++ b/contrib/tor2dns/serve