[or-cvs] r23149: {projects} synchronize to r23147 (projects/articles)

[Roger Dingledine]

Author: arma
Date: 2010-09-08 11:50:47 +0000 (Wed, 08 Sep 2010)
New Revision: 23149

Modified:
   projects/articles/circumvention-features.html
   projects/articles/circumvention-features.txt
Log:
synchronize to r23147


Modified: projects/articles/circumvention-features.html
===================================================================
--- projects/articles/circumvention-features.html	2010-09-08 11:50:30 UTC (rev 23148)
+++ projects/articles/circumvention-features.html	2010-09-08 11:50:47 UTC (rev 23149)
@@ -482,8 +482,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>.
-An earlier version of this article was prepared for the March 2010
-"Index on Censorship".
+Earlier versions of this article were prepared for the March 2010
+"Index on Censorship" and May 2010 Human Rights in China publication.
 Last updated 25 May 2010.
 </tt></p>
 

Modified: projects/articles/circumvention-features.txt
===================================================================
--- projects/articles/circumvention-features.txt	2010-09-08 11:50:30 UTC (rev 23148)
+++ projects/articles/circumvention-features.txt	2010-09-08 11:50:47 UTC (rev 23149)
@@ -398,7 +398,7 @@
 This article is licensed under the
 Creative Commons Attribution 3.0 United States License:
 http://creativecommons.org/licenses/by/3.0/us/.
-An earlier version of this article was prepared for the March 2010
-"Index on Censorship".
+Earlier versions of this article were prepared for the March 2010
+"Index on Censorship" and May 2010 Human Rights in China publication.
 Last updated 25 May 2010.