tor-webwml.git

@@ -1482,14 +1482,6 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

     Exitpolicy reject *:*

     BridgeRelay 1  # only add this line if you want to be a bridge

     </pre>

-    <p>

-    If you've installed <a

-    href="<page projects/obfsproxy-debian-instructions>#instructions">Obfsproxy</a>,

-    you'll need to add one more line:

-    </p>

-    <pre>

-    ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed

-    </pre>

     <hr>

@@ -2581,7 +2573,7 @@ short)

     <p>

     Several countries, including China and Iran, have found ways to

     detect and block connections to Tor bridges.

-    <a href="<page projects/obfsproxy>">Obfsproxy</a> bridges address

+    <a href="<page docs/pluggable-transports>">Obfsproxy</a> bridges address

     this by adding another layer of obfuscation.

     </p>

@@ -55,9 +55,10 @@

     ContactInfo human@...

     </pre>

+# TODO: Update link to PT setup docs

     <p>If you want to be a bridge, read about the BridgeRelay and

     ServerTransportPlugin values <a

-    href="<page projects/obfsproxy-instructions>#instructions">on

+    href="<page docs/pluggable-transports>">on

     this page</a>.</p>

     <p>Tor will use all your bandwidth if you don't set limits for it. Some

@@ -118,7 +118,7 @@

                 -->

               <td>

                 <div class="project">

-                <a href="<page projects/obfsproxy>"><img

+                <a href="<page docs/pluggable-transports>"><img

                 src="$(IMGROOT)/icon-Obfsproxy.jpg" alt="Pluggable Transports Icon"></a>

                 <h3><a href="<page docs/pluggable-transports>">Pluggable Transports</a></h3>

                 <p>Pluggable transports help you circumvent censorship.</p>

@@ -518,17 +518,6 @@ meetings around the world.</li>

     TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients.

     </p>

-    <a id="project-obfsproxy"></a>

-    <h3><a href="<page projects/obfsproxy>">Obfsproxy</a> (<a

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

-    <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Obfuscation%2FObfsproxy&order=priority">bug

-    tracker</a>)</h3>

-

-    <p>

-    A proxy that shapes Tor traffic, making it harder for censors to detect and

-    block Tor. This has both a C and python implementation.

-    </p>

-

     <a id="project-flash-proxy"></a>

     <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a

     href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a