# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1325015051 0
# Node ID 2fa4790fa684cbdf0262b82529608f383f5b025d
# Parent  1a037f07507059b50cb87cab683fe105539fb714# Parent  1dcc647991ca4d47c8facfe294639c72744131a0
Merge commit '78145ff44783ee3c6deb80d3ea47e939deef0c7e'

diff -r 1dcc647991ca -r 2fa4790fa684 db/as/32856/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/32856/owner	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+gain
diff -r 1dcc647991ca -r 2fa4790fa684 db/ip/01/80/58/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/80/58/cidr	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+1.128.88.0/24
diff -r 1dcc647991ca -r 2fa4790fa684 db/ip/01/80/58/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/80/58/owner	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+gain
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/AnonNet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/AnonNet/@/.gitignore	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/AnonNet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/AnonNet/@/default.key	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+12197c53a9ee15c104731f33e99e6cce5c328b915933d780e18f799069a9bf10
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/AnonNet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/AnonNet/@/owner	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/AnonNet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/AnonNet/@/path	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+/AnonNet
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/Cryto/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/.gitignore	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/Cryto/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/default.key	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+94e3d6af6861a3e8fd36ca67546771f25e0cf464d02ea980a4b699688e93860b
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/Cryto/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/owner	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/Cryto/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/path	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+/Cryto
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/EchoNode/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/.gitignore	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/EchoNode/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/default.key	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+8e8d51e5cd86543279ec0718c8b82839f583e08f4b0fa4a7f62834e75638463e
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/EchoNode/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/owner	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/EchoNode/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/path	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+/EchoNode
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/IranServ/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/.gitignore	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/IranServ/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/default.key	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+b0494fe9e1457500a41feb6c607c45bb85eca3ca821d7a218694ea23fd2c6a63
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/IranServ/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/owner	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 1dcc647991ca -r 2fa4790fa684 db/udpmsg4/IranServ/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/path	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+/IranServ
diff -r 1dcc647991ca -r 2fa4790fa684 db/usr/gain/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/gain/git	Tue Dec 27 19:44:11 2011 +0000
@@ -0,0 +1,1 @@
+git://1.128.88.2/resdb
diff -r 1dcc647991ca -r 2fa4790fa684 db/usr/wakawaka/git
--- a/db/usr/wakawaka/git	Sun Dec 25 04:57:46 2011 +0000
+++ b/db/usr/wakawaka/git	Tue Dec 27 19:44:11 2011 +0000
@@ -1,1 +1,1 @@
-git://sirio.ano/.git/
+git://1.9.9.1/.git/
diff -r 1dcc647991ca -r 2fa4790fa684 doc/www.anonet2.org/public_pod/links.pod
--- a/doc/www.anonet2.org/public_pod/links.pod	Sun Dec 25 04:57:46 2011 +0000
+++ b/doc/www.anonet2.org/public_pod/links.pod	Tue Dec 27 19:44:11 2011 +0000
@@ -4,6 +4,12 @@
 
 This is a collection of links that you may find interesting:
 
+20111221 - L<MythBuster Adam Savage: SOPA Could Destroy the Internet as We Know It|http://www.popularmechanics.com/science/mythbusters/articles/mythbuster-adam-savage-sopa-could-destroy-the-internet-as-we-know-it-6620300>
+
+20111220 - L<Anarchists should be reported, advises Westminster anti-terror police|http://www.guardian.co.uk/uk/2011/jul/31/westminster-police-anarchist-whistleblower-advice/print>
+
+20111220 - L<The U.S. Government targets Twitter Terrorism|http://www.salon.com/2011/12/20/the_u_s_government_targets_twitter_terrorism/print/>
+
 20111207 - L<Senate Wants the Military to Lock You Up Without Trial|http://www.wired.com/dangerroom/2011/12/senate-military-detention/>
 
 20111207 - L<NPR's domestic drone commercial|http://www.salon.com/2011/12/06/nprs_domestic_drone_commercial/singleton/?mobile.html>