[Blends-commit] [SCM] privacy branch, master, updated. a77b8df371c83e825ed90cb28e347fd1a7337c6c

[Iain R. Learmonth]

The following commit has been merged in the master branch:
commit a77b8df371c83e825ed90cb28e347fd1a7337c6c
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon Dec 29 17:53:41 2014 +0100

    Bits of taxonomy

diff --git a/doc/taxonomy.dot b/doc/taxonomy.dot
index 68c6704..acde144 100644
--- a/doc/taxonomy.dot
+++ b/doc/taxonomy.dot
@@ -37,12 +37,14 @@ digraph taxonomy {
 	i2p [label="I2P"];
 	mixmaster [label="Mixmaster"];
 	mat [label="Metadata Anonymisation Toolkit"];
+	freenet [label="Freenet"]
 
 	anonymity->tor;
 	anonymity->gnunet;
 	anonymity->i2p;
 	anonymity->mixmaster;
 	anonymity->mat;
+	anonymity->freenet;
 
 	gnupg [label="GnuPG"];
 	otr [label="OTR"];
@@ -61,7 +63,10 @@ digraph taxonomy {
 
 	censorship_research->ooni;
 
+	namecoin [label="Namecoin"]
+
 	circumvention->tor;
+	circumvention->namecoin;
 
 }
 
diff --git a/doc/taxonomy.png b/doc/taxonomy.png
index 4dbce7c..167ab55 100644
Binary files a/doc/taxonomy.png and b/doc/taxonomy.png differ

-- 
Debian Privacy Tools Pure Blend