[or-cvs] r23171: {projects} resync (projects/articles)

[Roger Dingledine <arma@xxxxxxxxxxxxxx>]

Author: arma
Date: 2010-09-13 20:08:12 +0000 (Mon, 13 Sep 2010)
New Revision: 23171

Modified:
   projects/articles/circumvention-features.html
   projects/articles/circumvention-features.txt
Log:
resync


Modified: projects/articles/circumvention-features.html
===================================================================
--- projects/articles/circumvention-features.html	2010-09-13 17:12:09 UTC (rev 23170)
+++ projects/articles/circumvention-features.html	2010-09-13 20:08:12 UTC (rev 23171)
@@ -19,19 +19,6 @@
 </p>
 
 <p>
-One caveat to start out: I'm an inventor and developer of a tool
-called <a href="https://www.torproject.org/";>Tor</a> that is used both
-for privacy and for
-circumvention. While my bias for more secure tools like Tor shows through
-here based on which features I've picked (meaning I raise issues that
-highlight Tor's strengths and that some other tool developers may not care
-about), I have also tried to include features that other tool developers
-consider important.
-</p>
-
-<h3>Introduction</h3>
-
-<p>
 Internet-based circumvention software consists of two components: a
 <i>relaying</i> component and a <i>discovery</i> component. The relaying
 component is what establishes a connection to some server or proxy,
@@ -50,6 +37,17 @@
 multiple layers of encryption, and so on.
 </p>
 
+<p>
+One caveat to start out: I'm an inventor and developer of a tool
+called <a href="https://www.torproject.org/";>Tor</a> that is used both
+for privacy and for
+circumvention. While my bias for more secure tools like Tor shows through
+here based on which features I've picked (meaning I raise issues that
+highlight Tor's strengths and that some other tool developers may not care
+about), I have also tried to include features that other tool developers
+consider important.
+</p>
+
 <h3>1. Diverse set of users</h3>
 
 <p>

Modified: projects/articles/circumvention-features.txt
===================================================================
--- projects/articles/circumvention-features.txt	2010-09-13 17:12:09 UTC (rev 23170)
+++ projects/articles/circumvention-features.txt	2010-09-13 20:08:12 UTC (rev 23171)
@@ -14,16 +14,6 @@
 I've chosen the order of features based on ease of presentation; so you
 shouldn't conclude the first feature is the most critical.
 
-One caveat to start out: I'm an inventor and developer of a tool
-called Tor (torproject.org) that is used both for privacy and for
-circumvention. While my bias for more secure tools like Tor shows through
-here based on which features I've picked (meaning I raise issues that
-highlight Tor's strengths and that some other tool developers may not care
-about), I have also tried to include features that other tool developers
-consider important.
-
-0. Introduction
-
 Internet-based circumvention software consists of two components: a
 <i>relaying</i> component and a <i>discovery</i> component. The relaying
 component is what establishes a connection to some server or proxy,
@@ -39,6 +29,14 @@
 much more sophisticated relaying components, made up of multiple proxies,
 multiple layers of encryption, and so on.
 
+One caveat to start out: I'm an inventor and developer of a tool
+called Tor (torproject.org) that is used both for privacy and for
+circumvention. While my bias for more secure tools like Tor shows through
+here based on which features I've picked (meaning I raise issues that
+highlight Tor's strengths and that some other tool developers may not care
+about), I have also tried to include features that other tool developers
+consider important.
+
 1. Diverse set of users
 
 One of the simplest questions you can ask when looking at a circumvention