tor-webwml.git

@@ -36,8 +36,8 @@ transport API</a>, to make it easier to build interoperable programs.

     <ul>

-    <li><b>Pyobfsproxy</b> is a Python framework for implementing new

-    transport protocols. It uses Twisted for its networking needs, and

+    <li><b>Obfsproxy</b> is a Python framework for implementing new

+    pluggable transports. It uses Twisted for its networking needs, and

     <a href="https://gitweb.torproject.org/pluggable-transports/pyptlib.git/blob/HEAD:/README.rst">pyptlib</a>

     for some pluggable transport-related features. It supports the

     <a href="https://gitweb.torproject.org/obfsproxy.git/blob/HEAD:/doc/obfs2/protocol-spec.txt">obfs2</a>

@@ -45,18 +45,7 @@ transport API</a>, to make it easier to build interoperable programs.

     <a href="https://gitweb.torproject.org/pluggable-transports/pyobfsproxy.git/blob/HEAD:/doc/obfs3/obfs3-protocol-spec.txt">obfs3</a>

     pluggable transports. Maintained by George Kadianakis. <br>

-    Status: <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-bundles">Deployed</a>

-    </li>

-

-    <li><b>Obfsproxy</b> is a framework for implementing new transport

-    protocols in C using libevent. See its

-    <a href="<page projects/obfsproxy>">web page</a>,

-    <a href="https://gitweb.torproject.org/obfsproxy.git">git repository</a>,

-    <a href="https://gitweb.torproject.org/obfsproxy.git/blob/HEAD:/doc/obfs2/protocol-spec.txt">obfs2 protocol description</a>,

-    and

-    <a href="https://blog.torproject.org/blog/obfsproxy-next-step-censorship-arms-race">blog post</a>.

-    Maintained by George Kadianakis. <br>

-    Status: <a href="../projects/obfsproxy.html.en#download">Deployed</a> <a href="https://bridges.torproject.org/?transport=obfs2">(Bridges)</a>

+    Status: <a href="https://www.torproject.org/projects/obfsproxy.html.en#download">Deployed</a>

     </li>

     <li><b>Flashproxy</b> turns ordinary web browsers into bridges using