diff options
author | lex <lex@lynx.ano> | 2011-01-11 10:54:57 -0600 |
---|---|---|
committer | lex <lex@lynx.ano> | 2011-01-11 10:54:57 -0600 |
commit | 2b33d2d3f770b695c3478b4a40d7bfdecb497547 (patch) | |
tree | bea6c33fc050f42bbc3643a25bf49d11b6b43934 | |
parent | 3466f25bd377b70c2b8930055603cfd4c9b08feb (diff) | |
parent | 7114bab4b35efe22e509797fb961522741381461 (diff) | |
download | resdb-2b33d2d3f770b695c3478b4a40d7bfdecb497547.tar.gz resdb-2b33d2d3f770b695c3478b4a40d7bfdecb497547.zip |
Merge git://1.9.8.4
-rw-r--r-- | db/dom/ano/1984/ns/ns1.1984.ano | 1 | ||||
-rw-r--r-- | db/dom/ano/1984/owner | 1 | ||||
-rw-r--r-- | db/usr/BrainBox/git | 1 | ||||
-rw-r--r-- | doc/www.anonet2.org/public_pod/index.pod | 21 |
4 files changed, 23 insertions, 1 deletions
diff --git a/db/dom/ano/1984/ns/ns1.1984.ano b/db/dom/ano/1984/ns/ns1.1984.ano new file mode 100644 index 0000000..87c9ad4 --- /dev/null +++ b/db/dom/ano/1984/ns/ns1.1984.ano @@ -0,0 +1 @@ +1.9.8.4 diff --git a/db/dom/ano/1984/owner b/db/dom/ano/1984/owner new file mode 100644 index 0000000..a0284bd --- /dev/null +++ b/db/dom/ano/1984/owner @@ -0,0 +1 @@ +BrainBox diff --git a/db/usr/BrainBox/git b/db/usr/BrainBox/git new file mode 100644 index 0000000..1af0f67 --- /dev/null +++ b/db/usr/BrainBox/git @@ -0,0 +1 @@ +git://1.9.8.4/ diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod index ad874f4..e25a7cc 100644 --- a/doc/www.anonet2.org/public_pod/index.pod +++ b/doc/www.anonet2.org/public_pod/index.pod @@ -61,7 +61,26 @@ Note 2: your IRC client always sends your configured username, realname and poss =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 |