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

[Roger Dingledine]

Author: arma
Date: 2010-09-13 22:34:51 +0000 (Mon, 13 Sep 2010)
New Revision: 23176

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 22:02:09 UTC (rev 23175)
+++ projects/articles/circumvention-features.html	2010-09-13 22:34:51 UTC (rev 23176)
@@ -480,8 +480,8 @@
 This article is licensed under the <a
 href="http://creativecommons.org/licenses/by/3.0/us/">Creative Commons
 Attribution 3.0 United States License</a>.
-Earlier versions of this article were prepared for the March 2010
-"Index on Censorship" and May 2010 Human Rights in China publication.
+Originally prepared for the March 2010 "Index on Censorship",
+then adapted for the July 2010 "China Rights Forum".
 Last updated 25 May 2010.
 </tt></p>
 

Modified: projects/articles/circumvention-features.txt
===================================================================
--- projects/articles/circumvention-features.txt	2010-09-13 22:02:09 UTC (rev 23175)
+++ projects/articles/circumvention-features.txt	2010-09-13 22:34:51 UTC (rev 23176)
@@ -396,7 +396,7 @@
 This article is licensed under the
 Creative Commons Attribution 3.0 United States License:
 http://creativecommons.org/licenses/by/3.0/us/.
-Earlier versions of this article were prepared for the March 2010
-"Index on Censorship" and May 2010 Human Rights in China publication.
+Originally prepared for the March 2010 "Index on Censorship",
+then adapted for the July 2010 "China Rights Forum".
 Last updated 25 May 2010.