# HG changeset patch # User Nick # Date 1287344648 0 # Node ID f2c698254c7bcf77e667b0fcc19ab60fc2ffb5a6 # Parent 45425cd06ee917ddd2ad20f9e448ec30ba5af4ab# Parent f3be54dc0a7c7a566438d30ba2828a1fde7d9f69 Merge http://anogit.ucis.ano/ diff -r f3be54dc0a7c -r f2c698254c7b contrib/quicktun-2.1.2.tgz Binary file contrib/quicktun-2.1.2.tgz has changed diff -r f3be54dc0a7c -r f2c698254c7b db/as/6666/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/as/6666/owner Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +astrosmash diff -r f3be54dc0a7c -r f2c698254c7b db/dom/ano/anonet1wiki/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/anonet1wiki/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ + diff -r f3be54dc0a7c -r f2c698254c7b db/dom/ano/anonet1wiki/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/anonet1wiki/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ + diff -r f3be54dc0a7c -r f2c698254c7b db/dom/ano/anonet1wiki/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/anonet1wiki/owner Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +somerandomnick diff -r f3be54dc0a7c -r f2c698254c7b db/dom/ano/astrosmash/ns/ns1.astrosmash.ano --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/astrosmash/ns/ns1.astrosmash.ano Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +1.1.90.10 diff -r f3be54dc0a7c -r f2c698254c7b db/dom/ano/astrosmash/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/astrosmash/owner Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +astrosmash diff -r f3be54dc0a7c -r f2c698254c7b db/ip/01/01/5A/cidr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/01/5A/cidr Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +1.1.90.0/24 diff -r f3be54dc0a7c -r f2c698254c7b db/ip/01/01/5A/ns/ns1.astrosmash.ano --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/01/5A/ns/ns1.astrosmash.ano Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +1.1.90.10 diff -r f3be54dc0a7c -r f2c698254c7b db/ip/01/01/5A/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/01/5A/owner Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +astrosmash diff -r f3be54dc0a7c -r f2c698254c7b db/usr/astrosmash/git --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/astrosmash/git Sun Oct 17 19:44:08 2010 +0000 @@ -0,0 +1,1 @@ +git://1.1.90.10/ diff -r f3be54dc0a7c -r f2c698254c7b doc/www.anonet2.org/public_pod/faq.pod --- a/doc/www.anonet2.org/public_pod/faq.pod Fri Oct 15 01:23:30 2010 +0200 +++ b/doc/www.anonet2.org/public_pod/faq.pod Sun Oct 17 19:44:08 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 are also used. (tinc in particular deserves special attention: it can create a mesh between participants, sacrificing anonymity to achieve lower latency.) diff -r f3be54dc0a7c -r f2c698254c7b doc/www.anonet2.org/public_pod/index.pod --- a/doc/www.anonet2.org/public_pod/index.pod Fri Oct 15 01:23:30 2010 +0200 +++ b/doc/www.anonet2.org/public_pod/index.pod Sun Oct 17 19:44:08 2010 +0000 @@ -23,6 +23,14 @@ L (doesn't hide your identity) +=item IRC chat + +L (hides your identity) + +=item IRC chat + +L (partly hides your identity) + =item telnet chat L (hides your identity) @@ -33,8 +41,7 @@ =back -If you're feeling adventurous enough to connect, L. +If you're feeling adventurous enough to connect at the IP level, L. Once you're online, you can reconnect to IRC from inside AnoNet: @@ -240,16 +247,14 @@ If you're looking for a ready-made community, where you just show up and "browse," AnoNet (either 1 or 2) is probably not quite what you're after. The whole concept behind AnoNet is that it's whatever you make it. -That's not to say you'll have to build everything from scratch (and -in fact, it's a bit too late for that, unless you want to Ibuild -stuff that others have already built - and if you can do better than the -original, people will probably switch to your version), but if you want to -be happy here, you're best off bringing your creativity along rather than -leaving it behind when you join. (If you've been around darknets before, -you're probably quite familiar with "design by committee." On AnoNet, -you're more than welcome to invite a committee to discuss anything you -want, but you don't have to. If you already know what you're doing, -just "build it and they will come.") +Of course, that's not to say you'll have to build everything from +scratch, but if you want to be happy here, you're best off bringing +your creativity along rather than leaving it behind when you join. +(If you've been around darknets before, you're probably quite familiar +with "design by committee." On AnoNet, you're more than welcome to +invite a committee to discuss anything you want, but you don't have to +organize onebefore doing anything. If you already (think you) know what +you're doing, just "build it and they will come.") =head2 What You Can Do @@ -265,6 +270,10 @@ =item * +L (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) =item * diff -r f3be54dc0a7c -r f2c698254c7b git-commit --- a/git-commit Fri Oct 15 01:23:30 2010 +0200 +++ b/git-commit Sun Oct 17 19:44:08 2010 +0000 @@ -1,3 +1,3 @@ #!/bin/sh -git add configure db doc git-commit gitd scripts +git add configure db doc git-commit gitd scripts contrib git commit