March 2013 - tor-commits - lists.torproject.org

[torbutton/master] Bug 8313: Guard against multiple plugin notifications.
by mikeperry＠torproject.org 06 Mar '13

06 Mar '13

commit 410b0a5391655ec9d2c740c9b69ceddf5bbf313f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Mar 5 14:28:24 2013 -0800 Bug 8313: Guard against multiple plugin notifications. Turns out some plugins handle multiple mime types. --- src/chrome/content/torbutton.js | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d3c4631..2062e4d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -17,6 +17,8 @@ var m_tb_plugin_string = false; var m_tb_is_main_window = false; var m_tb_hidden_browser = false; +var m_tb_confirming_plugins = false; + var m_tb_window_height = window.outerHeight; var m_tb_window_width = window.outerWidth; @@ -127,7 +129,20 @@ var torbutton_unique_pref_observer = !m_tb_prefs.getBoolPref("extensions.torbutton.startup") && m_tb_prefs.getBoolPref("extensions.torbutton.confirm_plugins")) { torbutton_log(3, "Got plugin enabled notification: "+subject); - torbutton_confirm_plugins(); + + /* We need to protect this call with a flag becuase we can + * get multiple observer events for each mime type a plugin + * registers. Thankfully, these notifications arrive only on + * the main thread, *however*, our confirmation dialog suspends + * execution and allows more events to arrive until it is answered + */ + if (!m_tb_confirming_plugins) { + m_tb_confirming_plugins = true; + torbutton_confirm_plugins(); + m_tb_confirming_plugins = false; + } else { + torbutton_log(3, "Skipping notification for mime type: "+subject); + } } return; } @@ -554,7 +569,7 @@ function torbutton_confirm_plugins() { for (var index = 0; index < numTabs; index++) { var currentBrowser = tabbrowser.getBrowserAtIndex(index); if ("about:addons" == currentBrowser.currentURI.spec) { - torbutton_log(5, "Got browser: "+currentBrowser.currentURI.spec); + torbutton_log(3, "Got browser: "+currentBrowser.currentURI.spec); currentBrowser.reload(); } }

1 0

[flashproxy/master] Disable line-ending mangling in .gitattributes.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit 58f2463573c76ee24b5e680b7372c8b1eb58e482 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 12:57:25 2013 -0800 Disable line-ending mangling in .gitattributes. https://timclem.wordpress.com/2012/03/01/mind-the-end-of-your-line/ http://schacon.github.com/git/gitattributes.html#_checking_out_and_checking… --- .gitattributes | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fa1385d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* -text

1 0

[flashproxy/master] New pyobfsproxy executable name in OS X bundles.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit 3550c9ed5e74e4ceb4e6e180f20e5fba8c2fa2b8 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 12:34:38 2013 -0800 New pyobfsproxy executable name in OS X bundles. --- doc/bundle-macosx.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index c08557d..2a498cf 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -89,7 +89,7 @@ Copy files into the bundle. $ cp -r ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS $ mkdir -p Contents/Resources/Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Contents/Resources/Docs/FlashProxy - $ cp -r ~/pyobfsproxy/{obfsproxy,obfsproxy.py} Contents/MacOs + $ cp -r ~/pyobfsproxy/{obfsproxy,bin/pyobfsproxy} Contents/MacOs $ cp -r ~/bundle/usr/lib/python2.7/site-packages/{Crypto,pyptlib} Contents/MacOS $ mkdir -p Contents/Resources/Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy @@ -121,7 +121,7 @@ CircuitBuildTimeout 60 # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec obfsproxy.py managed +ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha.

1 0

[flashproxy/master] Remove line left form copy-paste.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit 0269f80063ee83ea9f9ee35709faef1ac98cd8f5 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 12:34:54 2013 -0800 Remove line left form copy-paste. --- doc/bundle-macosx.txt | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 2a498cf..dd406a4 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -93,7 +93,6 @@ Copy files into the bundle. $ cp -r ~/bundle/usr/lib/python2.7/site-packages/{Crypto,pyptlib} Contents/MacOS $ mkdir -p Contents/Resources/Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy - $ find App -name '*.pyc' | xargs rm -f $ find Contents/MacOS -name '*.pyc' | xargs rm -f Make the second half of Library/Vidalia/torrc look like this.

1 0

[flashproxy/master] New pyobfsproxy executable name in GNU/Linux bundles.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit fd5fe8cb7018cbeb95bc798e8d31114257f1cc57 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 12:05:51 2013 -0800 New pyobfsproxy executable name in GNU/Linux bundles. --- doc/bundle-gnulinux.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 9458ca4..c56c84a 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -112,7 +112,7 @@ Copy files into the bundle. $ cp -rL /usr/lib/pymodules/python2.6/M2Crypto App $ mkdir -p Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy - $ cp -rL ~/pyobfsproxy/{obfsproxy,obfsproxy.py} App + $ cp -rL ~/pyobfsproxy/{obfsproxy,bin/pyobfsproxy} App $ cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} App $ cp -rL /usr/lib/pymodules/python2.6/argparse.py App $ cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib App @@ -145,7 +145,7 @@ CircuitBuildTimeout 60 # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec ./App/obfsproxy.py managed +ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha.

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 06 Mar '13

06 Mar '13

commit e9b64f43f459f95533165fecb539dd0331146f15 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 6 20:16:30 2013 +0000 Update translations for tails-greeter_completed --- nb/nb.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/nb/nb.po b/nb/nb.po new file mode 100644 index 0000000..a7c4553 --- /dev/null +++ b/nb/nb.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <lateralus(a)imap.cc>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2013-03-06 20:11+0000\n" +"Last-Translator: lateralus <lateralus(a)imap.cc>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Innlogging" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Velkommen til Tails" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Bruk datalagringsmodus?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Ja" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Nei" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Passord:" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Skrivebeskyttet?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "Flere alternativ?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Administratorpassord" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Skriv inn administratorpassord i tilfelle du trenger å utføre administratoroppgaver.\nHvis ikke vil dette bli dekativert for bedre sikkerhet." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Passord:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Verifiser Passord:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows-kamuflasje" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Dette alternativet gjør at Tails ligner mer på Microsoft Windows XP. Dette kan være nyttig på offentlige steder for å unngå uønsket oppmerksomhet. " + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Aktiver Microsoft Windows XP-kamuflasje" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Språk" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Land" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Tastaturoppsett" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "Passordene samsvarer ikke" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist feilet med returkode %(returncode)s:\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Feil passord. Vennligst prøv igjen." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Annet..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 06 Mar '13

06 Mar '13

commit ecd04c6ba88f2ba86d96f3864e942c45870f1d3d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 6 20:16:26 2013 +0000 Update translations for tails-greeter --- nb/nb.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/nb/nb.po b/nb/nb.po new file mode 100644 index 0000000..a7c4553 --- /dev/null +++ b/nb/nb.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <lateralus(a)imap.cc>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2013-03-06 20:11+0000\n" +"Last-Translator: lateralus <lateralus(a)imap.cc>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Innlogging" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Velkommen til Tails" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Bruk datalagringsmodus?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Ja" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Nei" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Passord:" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Skrivebeskyttet?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "Flere alternativ?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Administratorpassord" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Skriv inn administratorpassord i tilfelle du trenger å utføre administratoroppgaver.\nHvis ikke vil dette bli dekativert for bedre sikkerhet." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Passord:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Verifiser Passord:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows-kamuflasje" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Dette alternativet gjør at Tails ligner mer på Microsoft Windows XP. Dette kan være nyttig på offentlige steder for å unngå uønsket oppmerksomhet. " + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Aktiver Microsoft Windows XP-kamuflasje" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Språk" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Land" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Tastaturoppsett" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "Passordene samsvarer ikke" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist feilet med returkode %(returncode)s:\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Feil passord. Vennligst prøv igjen." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Annet..."

1 0

[flashproxy/master] Remove extraneous link.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit 1db4a481e7f4698eaafbe295718fb6d685028b2f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 07:42:05 2013 -0800 Remove extraneous link. --- doc/windows-deployment-howto.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 2514a1a..87ca30f 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -82,7 +82,7 @@ You don't install this package; just unzip it at the same directory level as the flashproxy source code. (The flashproxy makefile expects to find PyInstaller at ../pyinstaller-2.0.) -=== OpenSSL http://www.openssl.org/source/ +=== OpenSSL https://openssl.org/source/ https://openssl.org/source/openssl-1.0.1c.tar.gz

1 0

[flashproxy/master] Make a command more uniform.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit 0e45419e3d959882dae6541499f9fbfeb20657f8 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 09:07:03 2013 -0800 Make a command more uniform. --- doc/bundle-windows.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 55d9296..b499a60 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -93,7 +93,7 @@ Copy files into the bundle. The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll from being overwritten. $ cd "Tor Browser" - $ cp -n ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App + $ cp -nr ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App $ mkdir -p Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy $ cp -nr ~/pyobfsproxy/dist/obfsproxy/{*.pyd,*.dll,*.exe,*.manifest,eggs} App

1 0

[flashproxy/master] Use the normal browser bundle rather than the obfsproxy bundle.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit 5cc72d6d084308463e8ba052233f6e77ac5caaad Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 08:57:19 2013 -0800 Use the normal browser bundle rather than the obfsproxy bundle. --- doc/bundle-gnulinux.txt | 28 +++++++++++----------------- doc/bundle-macosx.txt | 22 ++++++++-------------- doc/bundle-windows.txt | 22 ++++++++-------------- 3 files changed, 27 insertions(+), 45 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index dab8f22..a2807c7 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -87,26 +87,25 @@ Clone pyobfsproxy. $ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2 -Within the VM, download the 32-bit or 64-bit obfsproxy bundle from -https://www.torproject.org/projects/obfsproxy. The instructions below -are for the 32-bit (i686) version. +Within the VM, download the 32-bit or 64-bit browser bundle from +https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbundlealpha. +The instructions below are for the 32-bit (i686) version. -https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz -https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz.asc +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz.asc -https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-2.4.7-alpha-1-dev-en-US.tar.gz -https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-2.4.7-alpha-1-dev-en-US.tar.gz.asc +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.10-alpha-2-dev-en-US.tar.gz +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.10-alpha-2-dev-en-US.tar.gz.asc Extract the bundle. - $ gpg --verify tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz.asc + $ gpg --verify tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz.asc $ rm -r tor-browser_en-US - $ tar xzvf tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz + $ tar xzvf tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz Copy files into the bundle. $ cd tor-browser_en-US - $ rm -f App/obfsproxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} App $ cp -rL /usr/lib/pymodules/python2.6/M2Crypto App $ mkdir -p Docs/FlashProxy @@ -119,12 +118,7 @@ Copy files into the bundle. $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy $ find App -name '*.pyc' | xargs rm -f -Make the second half of Data/Tor/torrc look like this (i.e., keep the -generic configuration, but change the obfsproxy-specific stuff). -Basically you are concatenating the normal flashproxy-client torrc, but -changing "./flashproxy-client" to "./App/flashproxy-client". You are -also changing "--managed" to "managed" in the obfsproxy -ClientTransportPlugin line. +Make the second half of Data/Tor/torrc look like this. UseBridges 1 # The address and port are ignored by the client transport plugin. @@ -142,7 +136,7 @@ ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 ClientTransportPlugin obfs2,obfs3 exec ./App/obfsproxy.py managed Re-zip the bundle. The "alpha" number should be independent of the -obfsproxy bundle's alpha. +browser bundle's alpha. $ cd .. $ tar czvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.6-alpha-1-dev-en-US.tar.gz tor-browser_en-US diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 851b456..93c8310 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -68,22 +68,21 @@ Clone pyobfsproxy. $ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2 -Download the 32-bit obfsproxy bundle from -https://www.torproject.org/projects/obfsproxy. +Download the 32-bit browser bundle from +https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbundlealpha. -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip.asc +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip.asc Extract the bundle. - $ gpg --verify TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip.asc + $ gpg --verify TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip.asc $ rm -r TorBrowser_en-US.app - $ unzip TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip + $ unzip TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip Copy files into the bundle. $ cd TorBrowser_en-US.app - $ rm -f Contents/MacOS/obfsproxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS $ cp -r ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS $ mkdir -p Contents/Resources/Docs/FlashProxy @@ -95,12 +94,7 @@ Copy files into the bundle. $ find App -name '*.pyc' | xargs rm -f $ find Contents/MacOS -name '*.pyc' | xargs rm -f -Make the second half of Library/Vidalia/torrc look like this (i.e., keep -the generic configuration, but change the obfsproxy-specific stuff). -Basically you are concatenating the normal flashproxy-client torrc, but -changing "./flashproxy-client" to "flashproxy-client". You are also -changing "--managed" to "managed" and "obfsproxy" to "obfsproxy.py" in -the obfsproxy ClientTransportPlugin line. +Make the second half of Library/Vidalia/torrc look like this. UseBridges 1 # The address and port are ignored by the client transport plugin. @@ -118,7 +112,7 @@ ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 ClientTransportPlugin obfs2,obfs3 exec obfsproxy.py managed Re-zip the bundle. The "alpha" number should be independent of the -obfsproxy bundle's alpha. +browser bundle's alpha. $ cd .. $ rm -f TorBrowser-FlashProxy-PyObfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 0dfbd94..55d9296 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -77,23 +77,22 @@ Clone pyobfsproxy and run PyInstaller on it. $ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2 $ /cygdrive/c/Python27/python.exe ../pyinstaller-2.0/pyinstaller.py obfsproxy.py -Download the obfsproxy bundle from -https://www.torproject.org/projects/obfsproxy. +Download the browser bundle from +https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbundlealpha. -https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe -https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe.asc +https://www.torproject.org/dist/torbrowser/tor-browser-2.4.10-alpha-2_en-US.exe +https://www.torproject.org/dist/torbrowser/tor-browser-2.4.10-alpha-2_en-US.exe.asc Extract the bundle. - $ gpg --verify tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe.asc + $ gpg --verify tor-browser-2.4.10-alpha-2_en-US.exe.asc $ rm -r "Tor Browser" - $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe + $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-browser-2.4.10-alpha-2_en-US.exe Copy files into the bundle. The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll from being overwritten. $ cd "Tor Browser" - $ rm -f App/obfsproxy.exe $ cp -n ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App $ mkdir -p Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy @@ -101,12 +100,7 @@ LIBEAY32.dll and SSLEAY32.dll from being overwritten. $ mkdir -p Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy -Make the second half of Data/Tor/torrc look like this (i.e., keep the -generic configuration, but change the obfsproxy-specific stuff). -Basically you are concatenating the normal flashproxy-client torrc, but -changing "./flashproxy-client" to "flashproxy-client". You are also -changing "--managed" to "managed" in the obfsproxy ClientTransportPlugin -line. +Make the second half of Data/Tor/torrc look like this. UseBridges 1 # The address and port are ignored by the client transport plugin. @@ -124,7 +118,7 @@ ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 ClientTransportPlugin obfs2,obfs3 exec obfsproxy managed Re-zip the bundle. The "alpha" number should be independent of the -obfsproxy bundle's alpha. The 7zg program (as opposed to 7z) causes the +browser bundle's alpha. The 7zg program (as opposed to 7z) causes the self-extractor to show a GUI. $ cd ..

1 0