[tor-commits] r26693: {website} Some updates to the PT page. (website/trunk/docs/en)

[George Kadianakis]

Author: asn
Date: 2014-04-06 01:20:21 +0000 (Sun, 06 Apr 2014)
New Revision: 26693

Modified:
   website/trunk/docs/en/pluggable-transports.wml
Log:
Some updates to the PT page.

Modified: website/trunk/docs/en/pluggable-transports.wml
===================================================================
--- website/trunk/docs/en/pluggable-transports.wml	2014-04-05 08:08:20 UTC (rev 26692)
+++ website/trunk/docs/en/pluggable-transports.wml	2014-04-06 01:20:21 UTC (rev 26693)
@@ -44,32 +44,44 @@
     and
     <a href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/blob/HEAD:/doc/obfs3/obfs3-protocol-spec.txt">obfs3</a>
     pluggable transports. Maintained by asn. <br>
-
-    Status: <a href="<page projects/obfsproxy>#download">Deployed</a>
+    Status: <a href="#download">Deployed</a>
     </li>
 
-    <li><b>Flashproxy</b> turns ordinary web browsers into bridges using
+    <li><a href="https://crypto.stanford.edu/flashproxy/"><b>Flashproxy</b></a> turns ordinary web browsers into bridges using
     websockets, and has a little python stub to hook Tor clients to the
     websocket connection. See its
-    <a href="https://crypto.stanford.edu/flashproxy/">web page</a>,
     <a href="https://gitweb.torproject.org/flashproxy.git">git repository</a>,
     and
     <a href="https://crypto.stanford.edu/flashproxy/flashproxy.pdf">design paper</a>.
     Maintained by David Fifield.
     # <iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe>
     <br>
-    Status: <a href="https://crypto.stanford.edu/flashproxy/#how-to">Deployed</a>
+    Status: <a href="#download">Deployed</a>
     </li>
 
-    <li><b>ScrambleSuit</b> is a pluggable transport that protects
+    <li><a href="https://fteproxy.org/"><b>Format-Transforming
+    Encryption</b></a> (FTE) transforms Tor traffic to arbitrary
+    formats using their language descriptions. See the <a
+    href="https://kpdyer.com/publications/ccs2013-fte.pdf">research
+    paper</a>. <br> Status: <a href="#download">Deployed</a> </li>
+
+    <li><a href="http://www.cs.kau.se/philwint/scramblesuit/"><b>ScrambleSuit</b></a>
+    is a pluggable transport that protects
     against follow-up probing attacks and is also capable of changing
     its network fingerprint (packet length distribution,
-    inter-arrival times, etc.). It's part of the Obfsproxy framework. See its
-    <a href="http://www.cs.kau.se/philwint/scramblesuit/">official page</a>.
+    inter-arrival times, etc.). It's part of the Obfsproxy framework.
     Maintained by Philipp Winter. <br>
-    Status: <em>In testing</em>
+    Status: <em>To be deployed</em>
     </li>
 
+    <li><b>Meek</b> is a transport that uses HTTP for carrying bytes
+    and TLS for obfuscation. Traffic is relayed through a third-party
+    server (​Google App Engine). It uses a trick to talk to the third
+    party so that it looks like it is talking to an unblocked server.
+    Maintained by David Fifield. <br>
+    Status: <e>Coming soon</em>
+    </li>
+
     <li><b>StegoTorus</b> is an Obfsproxy fork that extends it to a)
     split Tor streams across multiple connections to avoid packet size
     signatures, and b) embed the traffic flows in traces that look like
@@ -95,13 +107,6 @@
     Status: <em>Undeployed</em>
     </li>
 
-    <li><b>Format-Transforming Encryption</b> (FTE) transforms Tor traffic
-    to arbitrary formats using their language descriptions. See
-    the <a href="https://kpdyer.com/publications/ccs2013-fte.pdf">research
-    paper</a> and <a href="https://fteproxy.org/">web page</a>. <br>
-    Status: <em>In testing</em>
-    </li>
-
     </ul>
 
     <p> Also see the <emph>unofficial</emph> pluggable transports <a