Author: runa Date: 2013-03-22 23:15:30 +0000 (Fri, 22 Mar 2013) New Revision: 26128 Modified: website/trunk/docs/en/pluggable-transports.wml Log: remove obfsproxy for asn Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2013-03-22 22:49:10 UTC (rev 26127) +++ website/trunk/docs/en/pluggable-transports.wml 2013-03-22 23:15:30 UTC (rev 26128) @@ -36,8 +36,8 @@ <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,20 +45,9 @@ <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> + Status: <a href="https://www.torproject.org/projects/obfsproxy.html.en#download">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> - </li> - <li><b>Flashproxy</b> turns ordinary web browsers into bridges using websockets, and has a little python stub to hook Tor clients to the websocket connection. See its