# HG changeset patch
# User lex <lex@lynx.ano>
# Date 1294764897 21600
# Node ID 5b0de48dd381fcfb4832d721fa7c941f89bd8b48
# Parent  4a4f9682f43e926cd7e2be7a41f369b4dda01d07# Parent  61d1265b506faf2ecd332eb6b756fcfc83725025
Merge git://1.9.8.4

diff -r 4a4f9682f43e -r 5b0de48dd381 db/dom/ano/1984/ns/ns1.1984.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/1984/ns/ns1.1984.ano	Tue Jan 11 10:54:57 2011 -0600
@@ -0,0 +1,1 @@
+1.9.8.4
diff -r 4a4f9682f43e -r 5b0de48dd381 db/dom/ano/1984/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/1984/owner	Tue Jan 11 10:54:57 2011 -0600
@@ -0,0 +1,1 @@
+BrainBox
diff -r 4a4f9682f43e -r 5b0de48dd381 db/usr/BrainBox/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/BrainBox/git	Tue Jan 11 10:54:57 2011 -0600
@@ -0,0 +1,1 @@
+git://1.9.8.4/
diff -r 4a4f9682f43e -r 5b0de48dd381 doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Mon Jan 10 17:45:04 2011 -0600
+++ b/doc/www.anonet2.org/public_pod/index.pod	Tue Jan 11 10:54:57 2011 -0600
@@ -61,7 +61,26 @@
 
 =back
 
-If you're feeling adventurous enough to connect at the IP level, L<UFO has a client port|http://ix.ucis.nl/clientport.php>. Once you're online, you can reconnect to IRC from inside AnoNet:
+If you're feeling adventurous enough to connect at the IP level, there
+are a few options available:
+
+=over
+
+=item *
+
+L<UFO has a client port.|http://ix.ucis.nl/clientport.php>  (You will
+need openvpn for this option, but there is no need for routing software.)
+
+=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
+or zebra.  If you are on Windows, DnRouter can do everything.)
+
+=back
+
+Once you're online, you can reconnect to IRC from inside AnoNet:
 
 =begin xhtml