Mercurial > hg > anonet-resdb
changeset 191:de420370c4ff draft
Merge git://1.1.90.10
| author | Nick <nick@somerandomnick.ano> |
|---|---|
| date | Fri, 15 Oct 2010 18:56:57 +0000 |
| parents | 36aec19f7ccb (diff) d08c9f494e79 (current diff) |
| children | 45425cd06ee9 d31c5102047f |
| files | |
| diffstat | 5 files changed, 20 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/anonet1wiki/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano Fri Oct 15 18:56:57 2010 +0000 @@ -0,0 +1,1 @@ +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/anonet1wiki/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano Fri Oct 15 18:56:57 2010 +0000 @@ -0,0 +1,1 @@ +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/anonet1wiki/owner Fri Oct 15 18:56:57 2010 +0000 @@ -0,0 +1,1 @@ +somerandomnick
--- a/doc/www.anonet2.org/public_pod/faq.pod Fri Oct 15 17:04:44 2010 +0000 +++ b/doc/www.anonet2.org/public_pod/faq.pod Fri Oct 15 18:56:57 2010 +0000 @@ -76,17 +76,18 @@ =item What is peering all about? -AnoNet is an internet. An internet means an internetwork, or a network -that connects between networks. An internetwork is normally constructed -by making links between the different networks, and then carrying -internetwork traffic along those links. (If network A has a link to -network B, then traffic from A to B or from B to A should probably pass -through that link.) Such a link is called a "peering," and the two -sides of that link are called "peers." On the IcannNet, peerings are -normally done over leased lines, but due to the nature of AnoNet, using -leased lines isn't much of an option for most peerings. Therefore, most -peerings are done over tunnels on the IcannNet. The most common software -for AnoNet tunnels is OpenVPN, although tinc and quicktuns are also used. +AnoNet is an internet. An internet means an internetwork, or a +network that connects between networks. An internetwork is normally +constructed by making links between the different networks, and then +carrying internetwork traffic along those links. (If network A has +a link to network B, then traffic from A to B or from B to A should +probably pass through that link.) Such a link is called a "peering," +and the two sides of that link are called "peers." On the IcannNet, +peerings are normally done over leased lines, but due to the nature of +AnoNet, using leased lines isn't much of an option for most peerings. +Therefore, most peerings are done over tunnels on the IcannNet. +The most common software for AnoNet tunnels is OpenVPN, although +tinc and L<quicktun|http://wiki.qontrol.nl/QuickTun> are also used. (tinc in particular deserves special attention: it can create a mesh between participants, sacrificing anonymity to achieve lower latency.)
--- a/doc/www.anonet2.org/public_pod/index.pod Fri Oct 15 17:04:44 2010 +0000 +++ b/doc/www.anonet2.org/public_pod/index.pod Fri Oct 15 18:56:57 2010 +0000 @@ -41,8 +41,7 @@ =back -If you're feeling adventurous enough to connect, L<UFO has a client -port|http://ix.ucis.nl/clientport.php>. +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: @@ -271,6 +270,10 @@ =item * +L<AnoNet1 Wiki Mirror|http://1.82.98.27/mediawiki> (You got that right: AnoNet1 can't seem to keep their own wiki up, so we decided to do it for them.) + +=item * + Webchat (looking to relay to IRC, L<http://www.sevilnatas.ano/chat/>) =item *