Mercurial > hg > anonet-resdb
changeset 846:46f437d5809d draft
Merge commit '3c8894eee4e8b446c8839e10236fbc90dd0a916d'
author | Nick <nick@somerandomnick.ano> |
---|---|
date | Tue, 20 Dec 2011 22:05:49 +0000 |
parents | 3ee7c7238137 (diff) 67a6cbbdd79c (current diff) |
children | 821b23588635 |
files | |
diffstat | 17 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- /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
--- 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>