# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1324418749 0
# Node ID 46f437d5809d64fa46039a77659a7c0ba9f03cf6
# Parent  3ee7c72381372e84564f0f25692e8f2d9c3031b1# Parent  67a6cbbdd79ce959c3278d89c79521993772daee
Merge commit '3c8894eee4e8b446c8839e10236fbc90dd0a916d'

diff -r 67a6cbbdd79c -r 46f437d5809d db/as/32856/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/32856/owner	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+gain
diff -r 67a6cbbdd79c -r 46f437d5809d 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 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+1.128.88.0/24
diff -r 67a6cbbdd79c -r 46f437d5809d 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 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+gain
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/Cryto/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/.gitignore	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/Cryto/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/default.key	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+94e3d6af6861a3e8fd36ca67546771f25e0cf464d02ea980a4b699688e93860b
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/Cryto/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/owner	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/Cryto/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/Cryto/@/path	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+/Cryto
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/EchoNode/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/.gitignore	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/EchoNode/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/default.key	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+8e8d51e5cd86543279ec0718c8b82839f583e08f4b0fa4a7f62834e75638463e
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/EchoNode/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/owner	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/EchoNode/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/EchoNode/@/path	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+/EchoNode
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/IranServ/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/.gitignore	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/IranServ/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/default.key	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+b0494fe9e1457500a41feb6c607c45bb85eca3ca821d7a218694ea23fd2c6a63
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/IranServ/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/owner	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 67a6cbbdd79c -r 46f437d5809d db/udpmsg4/IranServ/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IranServ/@/path	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+/IranServ
diff -r 67a6cbbdd79c -r 46f437d5809d db/usr/gain/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/gain/git	Tue Dec 20 22:05:49 2011 +0000
@@ -0,0 +1,1 @@
+git://1.128.88.2/resdb
diff -r 67a6cbbdd79c -r 46f437d5809d doc/www.anonet2.org/public_pod/links.pod
--- a/doc/www.anonet2.org/public_pod/links.pod	Mon Dec 19 18:05:58 2011 +0000
+++ b/doc/www.anonet2.org/public_pod/links.pod	Tue Dec 20 22:05:49 2011 +0000
@@ -4,6 +4,8 @@
 
 This is a collection of links that you may find interesting:
 
+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>