tor-webwml.git

@@ -32,7 +32,7 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]

 #Pluggable Transports

 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]

-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]

+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]

 RewriteRule ^projects/obfsproxy-debian-instructions/$ /docs/pluggable-transports [R=410,L]

 RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports [R=410,L]

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

     <h3>How to use PTs to bypass censorship</h3>

     <p>

-      If connections to Tor network are being blocked by your ISP or country,

-      follow this instructions:

+      If connections to the Tor network are being blocked by your ISP or

+      country, follow these instructions:

     </p>

     <a href="$(IMGROOT)/PT/2016-07-how-to-use-PT.png">

     <img src="$(IMGROOT)/PT/2016-07-how-to-use-PT.png" width="830"

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

     <h3>How to run PTs to help censored users</h3>

     <p>

       obfs4 is currently the most effective transport to bypass censorship.

-      To learn how to run this transport, please visit <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy">obfs4proxy wiki page</a>.

+      To learn how to run this transport, please visit the <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy">obfs4proxy wiki page</a>.

     </p>

     <hr>

@@ -1,150 +0,0 @@

-## translation metadata

-# Revision: $Revision$

-# Translation-Priority: 4-optional

-

-#include "head.wmi" TITLE="obfsproxy: Setting up an Obfsproxy Bridge on Debian/Ubuntu" CHARSET="UTF-8"

-

-<div id="content" class="clearfix">

-  <div id="breadcrumbs">

-    <a href="<page index>">Home &raquo; </a>

-    <a href="<page projects/projects>">Projects &raquo; </a>

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

-  </div>

-  <div id="maincol">

-

-    <!-- PUT CONTENT AFTER THIS TAG -->

-

-    <h1 id="instructions">Setting up an Obfsproxy Bridge on Debian/Ubuntu</h1>

-

-    <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="obfsproxy diagram"></a>

-

-    <p>

-    <img width="7%" height="7%" style="float: left;" src="$(IMGROOT)/icon-Obfsproxy.jpg">

-    <b> Hey! </b>

-    If you are <b>not</b> using Debian or Ubuntu, you better look

-    <a href="<page projects/obfsproxy-instructions>">at this other guide</a>

-    which sets up Obfsproxy from source.

-    </p>

-    <br><br>

-

-

-    <p>

-      This is a <b>Debian/Ubuntu</b> guide for installing the Python

-      version of obfsproxy. If you are still using the C version, we

-      recommend you to upgrade to the Python version!

-    </p>

-

-    <h3>Step 0: Install a recent version of Tor (>= 0.2.4.1)</h3>

-    <br>

-

-    <p>

-    Add the <a href="<page docs/debian>#ubuntu">official Tor

-    APT repository</a> and run the specified commands to install <code>tor</code>

-    and <code>deb.torproject.org-keyring</code>. You need <em>Tor 0.2.4.x</em> because

-    it knows how to automatically report your obfsproxy address to <a

-    href="https://bridges.torproject.org/?transport=obfs3">BridgeDB</a>.

-    </p>

-

-    <h3>Step 1: Install obfsproxy</h3>

-    <br>

-

-    <p>

-    Since you installed the Tor APT repository, installing obfsproxy is now a matter of running a command:

-    </p>

-

-    <pre style="margin: 1.5em 0 1.5em 2em">

-\# apt-get install obfsproxy

-    </pre>

-

-    <h3>Step 2: Configure Tor</h3>

-    <br>

-

-    <p>

-    Edit your <i>/etc/tor/torrc</i> to add:

-    </p>

-

-    <pre style="margin: 1.5em 0 1.5em 2em">

-SocksPort 0

-ORPort auto

-BridgeRelay 1

-Exitpolicy reject *:*

-

-\## CHANGEME_1 -> provide a nickname for your bridge, can be anything you like

-\#Nickname CHANGEME_1

-\## CHANGEME_2 -> provide some email address so we can contact you if there's a problem

-\#ContactInfo CHANGEME_2

-

-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed

-    </pre>

-

-    <p>

-    Don't forget to uncomment and edit the <i>CHANGEME</i> fields!

-    </p>

-

-    <h3>Step 3: Launch Tor and verify that it bootstraps</h3>

-    <br>

-

-    <p>

-    Restart Tor to use the new configuration file.

-    (Preface with sudo if needed.)

-    </p>

-

-    <pre style="margin: 1.5em 0 1.5em 2em">

-\# service tor restart

-    </pre>

-

-    <p>

-    Now check <i>/var/log/tor/log</i> and you should see something

-    like this:

-    </p>

-

-    <pre style="margin: 1.5em 0 1.5em 2em">

-Nov 05 16:40:45.000 [notice] We now have enough directory information to build circuits.

-Nov 05 16:40:45.000 [notice] Bootstrapped 80%: Connecting to the Tor network.

-Nov 05 16:40:46.000 [notice] Bootstrapped 85%: Finishing handshake with first hop.

-Nov 05 16:40:46.000 [notice] Bootstrapped 90%: Establishing a Tor circuit.

-Nov 05 16:40:48.000 [notice] Tor has successfully opened a circuit. Looks like client functionality is working.

-Nov 05 16:40:48.000 [notice] Bootstrapped 100%: Done.

-    </pre>

-

-    <p>

-    If Tor is earlier in the bootstrapping phase, wait until it gets to

-    100%.

-    </p>

-

-    <h3>Step 4: Set up port forwarding if needed</h3>

-    <br>

-

-    <p>

-    If you're behind a NAT/firewall, you'll need to make your bridge

-    reachable from the outside world — both on the ORPort and

-    the obfsproxy ports. The ORPort is whatever you defined in step two

-    above. To find your obfsproxy ports, check your Tor logs for a line

-    similar to this one:

-    </p>

-

-    <pre style="margin: 1.5em 0 1.5em 2em">

-Oct 05 20:00:41.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:42000

-    </pre>

-

-    <p>

-    The last number in each line, in this case <i>26821</i> and

-    <i>42000</i>, is the TCP port number that you need to forward

-    through your firewall. (The ports are randomly chosen the first

-    time Tor starts, but Tor will cache and reuse the same number in

-    future runs.) If you want to change the number, use Tor

-    0.2.4.7-alpha or later, and set something similar to

-    "ServerTransportListenAddr obfs3 0.0.0.0:26821" in your torrc.

-    </p>

-

-  </div>

-  <!-- END MAINCOL -->

-  <div id = "sidecol">

-#include "side.wmi"

-#include "info.wmi"

-  </div>

-  <!-- END SIDECOL -->

-</div>

-<!-- END CONTENT -->

-#include <foot.wmi>

-

@@ -1,164 +0,0 @@

-## translation metadata

-# Revision: $Revision$

-# Translation-Priority: 4-optional

-

-#include "head.wmi" TITLE="obfsproxy: Installation instructions" CHARSET="UTF-8"

-

-<div id="content" class="clearfix">

-  <div id="breadcrumbs">

-    <a href="<page index>">Home &raquo; </a>

-    <a href="<page projects/projects>">Projects &raquo; </a>

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

-  </div>

-  <div id="maincol">

-

-    <!-- PUT CONTENT AFTER THIS TAG -->

-

-    <h1 id="instructions">Obfsproxy Instructions</h1>

-

-    <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="client torrc"></a>

-

-      <p>

-        This is a guide for installing the Python version of obfsproxy. If

-        you still have the C version, we recommend you to upgrade to the

-        Python version!

-      </p>

-

-    <h3>Step 0: Install Python</h3>

-    <br>

-

-    <p>

-      To setup obfsproxy you will need <code>Python</code> (>= 2.7),

-      and <code>pip</code>. If you use Debian testing (or unstable),

-      or a version of Ubuntu newer than Oneiric, this is easy:

-    <p>

-

-    <tt># apt-get install python2.7 python-pip python-dev build-essential</tt>

-

-    <p>On Fedora, that command would look like:</p>

-

-    <tt># yum install make automake gcc python-pip python-devel libyaml-devel</tt>

-    <br>

-    <br>

-    <h3>Step 1: Install Tor</h3>

-    <br>

-

-    <p>

-      You will also need a recent version of Tor (>= 0.2.4.1). We recommend you use

-      <a href="<page docs/debian>#ubuntu">Tor's repositories for Debian/Ubuntu</a>

-      or

-      <a href="https://gitweb.torproject.org/tor.git">install Tor from git</a>.

-    </p>

-

-    <p>

-    You need Tor 0.2.4.x because it knows how to automatically report

-    your obfsproxy address to BridgeDB.

-    </p>

-

-    <h3>Step 2: Install obfsproxy</h3>

-    <br>

-

-    <p>

-      If you have <code>pip</code>, installing <code>obfsproxy</code>

-      and its dependencies should be a matter of a single command:

-    </p>

-

-    <tt># pip install obfsproxy</tt><br><br>

-

-    <p>

-    You will probably want to run the <em>pip install</em> command as

-    root so that obfsproxy gets installed to /usr/local/bin.

-    </p>

-    <p>

-    (Instead of using pip, you could also use <a

-    href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git">the

-    git repository</a> of obfsproxy if you feel more adventurous)

-    </p>

-

-    <h3>Step 3: Setup tor</h3>

-    <br>

-

-    <p>

-      Now setup Tor.  Edit your /etc/tor/torrc to add:

-    </p>

-

-      <p>

-        <tt>SocksPort 0</tt><br>

-        <tt>ORPort auto</tt><br>

-        <tt>BridgeRelay 1</tt><br>

-        <tt>Exitpolicy reject *:*</tt><br><br>

-

-        <tt>## CHANGEME_1 -> provide a nickname for your bridge, can be anything you like</tt><br>

-        <tt>#Nickname CHANGEME_1</tt><br>

-        <tt>## CHANGEME_2 -> provide some email address so we can contact you if there's a problem</tt><br>

-        <tt>#ContactInfo CHANGEME_2</tt><br><br>

-

-        <tt>ServerTransportPlugin obfs3 exec /usr/local/bin/obfsproxy managed</tt><br>

-      </p>

-

-      <p>

-        Don't forget to uncomment and edit the CHANGEME fields. Also,

-        if you didn't install obfsproxy as root, you might have to

-        change its path.

-      </p>

-

-      <h3>Step 4: Launch Tor and verify that it bootstraps</h3>

-      <br>

-

-      <p>

-        Restart Tor to use the new configuration file. (Preface with sudo if

-        needed.)

-      </p>

-

-      <tt># service tor restart</tt><br><br>

-

-      <p>

-        Now check /var/log/tor/log and you should see something like this:

-      </p>

-

-      <tt>Nov 05 16:40:45.000 [notice] We now have enough directory information to build circuits.</tt><br>

-      <tt>Nov 05 16:40:45.000 [notice] Bootstrapped 80%: Connecting to the Tor network.</tt><br>

-      <tt>Nov 05 16:40:46.000 [notice] Bootstrapped 85%: Finishing handshake with first hop.</tt><br>

-      <tt>Nov 05 16:40:46.000 [notice] Bootstrapped 90%: Establishing a Tor circuit.</tt><br>

-      <tt>Nov 05 16:40:48.000 [notice] Tor has successfully opened a circuit. Looks like client functionality is working.</tt><br>

-      <tt>Nov 05 16:40:48.000 [notice] Bootstrapped 100%: Done.</tt><br><br>

-

-      <p>

-        If Tor is earlier in the bootstrapping phase, wait until it gets to 100%.

-      </p>

-

-      <h3>Step 5: Set up port forwarding if needed</h3>

-      <br>

-

-      <p>

-        If you're behind a NAT/firewall, you'll need to make your bridge

-        reachable from the outside world — both on the ORPort and the

-        obfsproxy port. The ORPort is whatever you defined in step two

-        above. To find your obfsproxy port, check your Tor logs for two

-        lines similar to these:

-      </p>

-

-      <tt>Oct 05 20:00:42.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:40172</tt><br><br>

-

-      <p>

-        The last number in each line, in this case 26821 and 40172, are the

-        TCP port numbers that you need to forward through your

-        firewall. (This port is randomly chosen the first time Tor starts,

-        but Tor will cache and reuse the same number in future runs.) If you

-        want to change the number, use Tor 0.2.4.7-alpha or later, and set

-        "ServerTransportListenAddr obfs3 0.0.0.0:26821" in your torrc.

-      </p>

-

-    <br>

-

-  </div>

-  <!-- END MAINCOL -->

-  <div id = "sidecol">

-#include "side.wmi"

-#include "info.wmi"

-  </div>

-  <!-- END SIDECOL -->

-</div>

-<!-- END CONTENT -->

-#include <foot.wmi>

-

@@ -1,102 +0,0 @@

-## translation metadata

-# Revision: $Revision$

-# Translation-Priority: 4-optional

-

-#include "head.wmi" TITLE="Tor Project: obfsproxy" CHARSET="UTF-8"

-<div id="content" class="clearfix">

-  <div id="breadcrumbs">

-    <a href="<page index>">Home &raquo; </a>

-    <a href="<page projects/projects>">Projects &raquo; </a>

-    <a href="<page projects/obfsproxy>">obfsproxy &raquo; </a>

-  </div>

-  <div id="maincol">

-    <!-- PUT CONTENT AFTER THIS TAG -->

-

-    <h2>obfsproxy</h2>

-    <div class="underline"></div>

-

-    <!-- BEGIN SIDEBAR -->

-    <div class="sidebar-left">

-    </div>

-    <!-- END SIDEBAR -->

-

-    <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="obfsproxy diagram"></a>

-    </p>

-

-    <p>

-    obfsproxy is a tool that attempts to circumvent censorship, by

-    transforming the Tor traffic between the client and the

-    bridge. This way, censors, who usually monitor traffic between the

-    client and the bridge, will see innocent-looking transformed

-    traffic instead of the actual Tor traffic.

-

-    <p>

-    obfsproxy supports multiple protocols, called <a href="<page

-    docs/pluggable-transports>">pluggable transports</a>, which

-    specify how the traffic is transformed. For example, there might

-    be a HTTP transport which transforms Tor traffic to look like

-    regular HTTP traffic. See the <a href="<page

-    docs/pluggable-transports>">pluggable transports page</a> for more

-    information.

-    </p>

-

-    <p>

-    Even though obfsproxy is a separate application, completely

-    independent from tor, it speaks to tor using an <a

-    href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt">internal

-    protocol</a> to minimize necessary end-user configuration.

-    </p>

-

-    <p>

-    Please open a <a

-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_information&status=needs_review&status=needs_revision&status=new&status=reopened&component=Obfsproxy&order=priority&col=id&col=summary&col=status&col=type&col=priority&col=milestone&col=component">ticket</a>

-    on our bug tracker for any bugs you find or features you would

-    like to see added in future releases.

-    <br>

-    Also feel free to look or poke at

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

-    and send us back any improvements you make.

-    </p>

-

-    <a id="morebridges"></a>

-    <h2><a class="anchor" href="#morebridges">Looking for obfsproxy bridges?</a></h2>

-    <p>

-    <a href="https://bridges.torproject.org/bridges?transport=obfs3">You can use BridgeDB to get obfsproxy bridges.</a>

-    </p>

-

-

-    <a id="download"></a>

-    <h2><a class="anchor" href="#download">Download Tor Browser with obfsproxy</a></h2>

-

-    <p>

-    obfsproxy is included in the

-<a

-href="<page projects/torbrowser>#downloads">official

-Tor Browser packages</a>.

-    </p>

-

-    <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2>

-

-   <p>

-   To set up an obfsproxy bridge on a Debian/Ubuntu machine, see the separate

-   <a href="<page projects/obfsproxy-debian-instructions>#instructions">Obfsproxy Debian/Ubuntu Installation Instructions</a>

-   page.

-   </p>

-   <p>

-   To set up obfsproxy from source, see the separate

-   <a href="<page projects/obfsproxy-instructions>#instructions">Obfsproxy Installation Instructions</a>

-   page.

- </p>

-

-

-  </div>

-  <!-- END MAINCOL -->

-  <div id = "sidecol">

-#include "side.wmi"

-#include "info.wmi"

-  </div>

-  <!-- END SIDECOL -->

-</div>

-<!-- END CONTENT -->

-#include <foot.wmi>

-