November 2016 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-45.5.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit c556cdac99fcf4570feb4cfdb676fc56d384a101 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 12:01:44 2016 +0000 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. This fixes bug 20709. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 64ab700..ce16a75 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGE…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[webwml/master] Implement rewrite rules for donation campaign, again
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit d603837457a92091493cd479e57e6a23c84b656d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 13:55:41 2016 +0100 Implement rewrite rules for donation campaign, again --- .htaccess | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.htaccess b/.htaccess index 407b61f..32d7306 100644 --- a/.htaccess +++ b/.htaccess @@ -95,3 +95,21 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]

1 0

[webwml/master] Move current campaign redirects up
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 247d8d6b408acbb1aa124f82231c76dabca99c24 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 14:53:28 2016 +0100 Move current campaign redirects up --- .htaccess | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.htaccess b/.htaccess index 32d7306..8f54d2d 100644 --- a/.htaccess +++ b/.htaccess @@ -69,6 +69,27 @@ RewriteRule ^include/$ / [R=301,L] RewriteRule ^js/$ / [R=301,L] # Donation campagin +# 2016 +RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] + +# 2015 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] @@ -95,21 +116,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]

1 0

[webwml/staging] Move current campaign redirects up
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 497b70849a4e69d474aeaa34bcec65c801eb8b31 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 14:53:28 2016 +0100 Move current campaign redirects up --- .htaccess | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.htaccess b/.htaccess index 32d7306..8f54d2d 100644 --- a/.htaccess +++ b/.htaccess @@ -69,6 +69,27 @@ RewriteRule ^include/$ / [R=301,L] RewriteRule ^js/$ / [R=301,L] # Donation campagin +# 2016 +RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] + +# 2015 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] @@ -95,21 +116,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]

1 0

[webwml/staging] redirect old obfsproxy pages to PT page
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit ff7363907c0a9ec1b4b7d12115ee8a2604ce6f38 Author: Nima Fatemi <nima(a)torproject.org> Date: Wed Jul 6 22:03:52 2016 +0000 redirect old obfsproxy pages to PT page --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index b85f8ee..c896fe6 100644 --- a/.htaccess +++ b/.htaccess @@ -32,6 +32,9 @@ 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-debian-instructions/$ /docs/pluggable-transports [R=410,L] +RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports [R=410,L] # GetInvolved RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]

1 0

[webwml/staging] Remove link to same page via redirects
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit f1819af6f6be1c09cbd31eab8525359356673a0c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 14 21:22:39 2016 +0200 Remove link to same page via redirects --- docs/en/pluggable-transports.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml index 99d3c3b..3cd7033 100644 --- a/docs/en/pluggable-transports.wml +++ b/docs/en/pluggable-transports.wml @@ -110,7 +110,7 @@ transport API</a>, to make it easier to build interoperable programs. <br> <ul>  - <li><a href="<page projects/obfsproxy>"><b>Obfsproxy</b></a> is a Python framework for implementing new + <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/tree/README.…">pyptlib</a> for some pluggable transport-related features. It supports the

1 0

[webwml/staging] Fix up PT changes
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 44c667ecd025ecb10a332551c4051b0533db6a7a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 14 21:20:36 2016 +0200 Fix up PT changes --- .htaccess | 2 +- docs/en/pluggable-transports.wml | 6 +- projects/en/obfsproxy-debian-instructions.wml | 150 ----------------------- projects/en/obfsproxy-instructions.wml | 164 -------------------------- projects/en/obfsproxy.wml | 102 ---------------- 5 files changed, 4 insertions(+), 420 deletions(-) diff --git a/.htaccess b/.htaccess index c896fe6..d6d7dc4 100644 --- a/.htaccess +++ b/.htaccess @@ -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] diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml index 65cbe45..99d3c3b 100644 --- a/docs/en/pluggable-transports.wml +++ b/docs/en/pluggable-transports.wml @@ -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/obfs4…">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/obfs4…">obfs4proxy wiki page</a>. </p> <hr> diff --git a/projects/en/obfsproxy-debian-instructions.wml b/projects/en/obfsproxy-debian-instructions.wml deleted file mode 100644 index 4911bc5..0000000 --- a/projects/en/obfsproxy-debian-instructions.wml +++ /dev/null @@ -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 » </a> - <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/obfsproxy>">obfsproxy</a> - </div> - <div id="maincol"> - -  - - <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> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/projects/en/obfsproxy-instructions.wml b/projects/en/obfsproxy-instructions.wml deleted file mode 100644 index 4df5fee..0000000 --- a/projects/en/obfsproxy-instructions.wml +++ /dev/null @@ -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 » </a> - <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/obfsproxy>">obfsproxy</a> - </div> - <div id="maincol"> - -  - - <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> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/projects/en/obfsproxy.wml b/projects/en/obfsproxy.wml deleted file mode 100644 index 44ffd94..0000000 --- a/projects/en/obfsproxy.wml +++ /dev/null @@ -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 » </a> - <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/obfsproxy>">obfsproxy » </a> - </div> - <div id="maincol"> -  - - <h2>obfsproxy</h2> - <div class="underline"></div> - -  - <div class="sidebar-left"> - </div> -  - - <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=assig…">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> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> -

1 0

[webwml/staging] add link to obfs4 instructions
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit d50ef37e46483fcde8e8d24f81ee864b004521fb Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jul 14 18:51:37 2016 +0000 add link to obfs4 instructions --- docs/en/pluggable-transports.wml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml index 482538f..65cbe45 100644 --- a/docs/en/pluggable-transports.wml +++ b/docs/en/pluggable-transports.wml @@ -43,6 +43,12 @@ transport API</a>, to make it easier to build interoperable programs. 4-select obfs4 5-press connect" /></a>  + <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/obfs4…">obfs4proxy wiki page</a>. + </p> + <hr> <h3>Currently deployed PTs</h3>

1 0

[webwml/staging] add graphic instructions on how to use PTs
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit f2c6c8aef5dcc41b1fee3afb6037182c7aae873e Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Jul 12 20:37:02 2016 +0000 add graphic instructions on how to use PTs --- docs/en/pluggable-transports.wml | 12 +++++++++++- images/PT/2016-07-how-to-use-PT.png | Bin 0 -> 494386 bytes 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml index 8c55572..482538f 100644 --- a/docs/en/pluggable-transports.wml +++ b/docs/en/pluggable-transports.wml @@ -32,13 +32,23 @@ href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt">pluggable transport API</a>, to make it easier to build interoperable programs. </p> + <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: + </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" + alt="How to use PTs: 1-download tor (send email to gettor(a)torproject.org) 2-select configure 3-check 'my isp blocks tor...' + 4-select obfs4 5-press connect" /></a> +  + <hr> <h3>Currently deployed PTs</h3> <p> These Pluggable Transports are currently deployed in Tor Browser, and you can start using them by <a href="<page download/download-easy>">downloading and using Tor Browser</a>. </p> -  <ul> diff --git a/images/PT/2016-07-how-to-use-PT.png b/images/PT/2016-07-how-to-use-PT.png new file mode 100644 index 0000000..0994f04 Binary files /dev/null and b/images/PT/2016-07-how-to-use-PT.png differ

1 0

[webwml/staging] replace obfsproxy with PT in projects page and navbar
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 8eaa93901ce09178ba260883c0d107820bb306a6 Author: Nima Fatemi <nima(a)torproject.org> Date: Wed Jul 6 22:43:17 2016 +0000 replace obfsproxy with PT in projects page and navbar --- projects/en/projects.wml | 10 ++++++---- projects/en/sidenav.wmi | 10 +++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/projects/en/projects.wml b/projects/en/projects.wml index b5c844b..985b050 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -52,12 +52,14 @@ default and sends all of its traffic over Tor.</p> </div></div> <div class="projectbox"> -<a href="<page projects/obfsproxy>"><img class="icon" +<a href="<page docs/pluggable-transports>"><img class="icon" src="$(IMGROOT)/icon-Obfsproxy.jpg" height="80px" alt="" width="78"></a> <div class="projectdesc"><div class="name"><a -href="<page projects/obfsproxy>">Obfsproxy</a></div> -<p>Obfsproxy is a pluggable transports proxy. It shapes Tor traffic, -making it harder for censors to detect and block the Tor protocol.</p> +href="<page docs/pluggable-transports>">Pluggable Transports</a></div> +<p>Pluggable Transports (PT) transform the Tor traffic flow between the client +and the bridge. This way, censors who monitor traffic between the +client and the bridge will see innocent-looking transformed traffic +instead of the actual Tor traffic.</p> </div> </div> diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi index 160d20c..4be3c78 100644 --- a/projects/en/sidenav.wmi +++ b/projects/en/sidenav.wmi @@ -15,11 +15,11 @@ # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt - +# need to supply alternate txt + <: my $sidenav; $sidenav = [ @@ -47,8 +47,8 @@ {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', }, - {'url' => 'projects/obfsproxy', - 'txt' => 'Obfsproxy', + {'url' => 'docs/pluggable-transports', + 'txt' => 'Pluggable Transports', }, {'url' => 'https://shadow.cs.umn.edu/', 'txt' => 'Shadow',

1 0