- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-3.6] Fix changelog to say 3.6.4.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 23bccdb1ca1003a326b3815019aa88722d59e386 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:24:20 2014 -0700 Fix changelog to say 3.6.4. Also update Torbutton version to pick up some UI tweaks. --- Bundle-Data/Docs/ChangeLog.txt | 5 ++++- gitian/versions | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7ecd891..d2468be 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,11 @@ -Tor Browser Bundle 3.6.3 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 6 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 * Bug 9516: Send Tor Launcher log messages to Browser Console + * Update Torbutton to 1.6.11.1 + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 12680: Fix Torbutton about url. Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms diff --git a/gitian/versions b/gitian/versions index 10690ce..e5e53e4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.23 TORLAUNCHER_TAG=0.2.5.6 -TORBUTTON_TAG=1.6.11.0 +TORBUTTON_TAG=1.6.11.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/maint-3.6] Add Changelog fo 3.6.4.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit a37f1c0cf686c2ad3cdbe715c6b242a0d2cfb9ac Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 18:34:49 2014 -0700 Add Changelog fo 3.6.4. Also bump Tor Launcher version to pick up #9516. --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ gitian/versions | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1e12190..7ecd891 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser Bundle 3.6.3 -- Aug 6 2014 + * All Platforms + * Update Tor to 0.2.4.23 + * Update Tor launcher to 0.2.5.6 + * Bug 9516: Send Tor Launcher log messages to Browser Console + Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms * Update Firefox to 24.7.0esr diff --git a/gitian/versions b/gitian/versions index 38eae32..10690ce 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.4pre +TORBROWSER_VERSION=3.6.4 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.23 -TORLAUNCHER_TAG=0.2.5.5 +TORLAUNCHER_TAG=0.2.5.6 TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1

1 0

[tor-launcher/maint-0.2.5] Bump version to 0.2.5.6.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit e058a548e736c75982873614631c1f4cb37b04a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 18:22:36 2014 -0700 Bump version to 0.2.5.6. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 702745d..bd64022 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.5.5</em:version> + <em:version>0.2.5.6</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/master] Bug 12753: Zeroing timestamps in PE headers.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit ad5ea06183c12e8ae18274a72cb5bbc353180400 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 4 14:26:34 2014 +0000 Bug 12753: Zeroing timestamps in PE headers. Switching to a new toolchain for Windows (using Binutils 2.24 and GCC 4.8.3) led to new problems producing Windows bundles in a reliable fashion. Thanks to a patch by a cypherpunk we avoid differences in PE header timestamps as one possible source for the issues mentioned in bug 12753. --- gitian/descriptors/windows/gitian-utils.yml | 3 +++ gitian/patches/peXXigen.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 87a0bce..87dbe16 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -31,6 +31,7 @@ files: - "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" +- "peXXigen.patch" - "versions" - "dzip.sh" script: | @@ -45,6 +46,8 @@ script: | cd binutils* # XXX: This is needed due to bug 10102. sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + # Zeroing timestamps in PE headers reliably, see bug 12753. + patch -p1 < ../peXXigen.patch ./configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib make $MAKEOPTS make install diff --git a/gitian/patches/peXXigen.patch b/gitian/patches/peXXigen.patch new file mode 100644 index 0000000..785aa02 --- /dev/null +++ b/gitian/patches/peXXigen.patch @@ -0,0 +1,14 @@ +diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c +*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 +--- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 +*************** +*** 795,800 **** +--- 795,802 ---- + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr);

1 0

[tor-browser-bundle/master] Set a blackhole proxy in the meek-http-helper profile.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit 92e501a980295a06c2eb94bf03370b66ef8e5563 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 27 09:53:07 2014 -0700 Set a blackhole proxy in the meek-http-helper profile. https://trac.torproject.org/projects/tor/ticket/12674 The extension manually overrides the proxy setting for every request, so this doesn't affect the functioning of the extension. It's intended as a failsafe to prevent network interaction in case something goes wrong and the user manages to disable the extension and open the profile with a normal browser window. In order to cause that to happen, I had to do: ./Browser/firefox -safe-mode -profile Data/Browser/profile.meek-http-helper/ Prior to this commit, running the above command would have given you an ordinary unproxied Firefox. Now you will get "The proxy server is refusing connections." --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index a95a6ec..cddc237 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,13 +4,6 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); -// 0 is "No proxy". -user_pref("network.proxy.type", 0); - -// Allow unproxied DNS. -// https://trac.torproject.org/projects/tor/ticket/11183#comment:6 -user_pref("network.proxy.socks_remote_dns", false); - // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9 @@ -21,4 +14,17 @@ user_pref("security.enable_tls_session_tickets", true); // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1); +// Set a failsafe blackhole proxy of 127.0.0.1:9, to prevent network interaction +// in case the user manages to open this profile with a normal browser UI (i.e., +// not headless with the meek-http-helper extension running). Port 9 is +// "discard", so it should work as a blackhole whether the port is open or +// closed. network.proxy.type=1 means "Manual proxy configuration". +// http://kb.mozillazine.org/Network.proxy.type +user_pref("network.proxy.type", 1); +user_pref("network.proxy.socks", "127.0.0.1"); +user_pref("network.proxy.socks_port", 9); +// Make sure DNS is also blackholed. network.proxy.socks_remote_dns is +// overridden by meek-http-helper at startup. +user_pref("network.proxy.socks_remote_dns", true); + user_pref("extensions.enabledAddons", "meek-http-helper@bamsoftware.com:1.0");

1 0

[tor-browser-bundle/master] Use meek 0.10.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit 69b9ca1b186a575debf823de760a0a048da03819 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Aug 2 00:57:37 2014 -0700 Use meek 0.10. 0.10 has the patch to set network.proxy.socks_remote_dns=false within the Firefox extension, so it doesn't have to be set in user.js. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index ae465d2..20c7e73 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d28bbdc..8f558d7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.beta b/gitian/versions.beta index 16692b2..dbb50d8 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-launcher/maint-0.2.5] Bug 9516: Show Tor log in TorBrowser
by brade＠torproject.org 01 Aug '14

01 Aug '14

commit 40751d8580192902227a447ee89d8018a34800c9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 31 14:18:56 2014 -0400 Bug 9516: Show Tor log in TorBrowser Provide a stopgap solution: route all tor messages captured by Tor Launcher to the Browser Console. --- src/components/tl-protocol.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index bcff6ab..0e78736 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -25,6 +25,12 @@ function TorProtocolService() try { + this.mConsoleSvc = Cc["@mozilla.org/consoleservice;1"] + .getService(Ci.nsIConsoleService); + } catch (e) {} + + try + { var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); @@ -497,6 +503,7 @@ TorProtocolService.prototype = // Private Member Variables //////////////////////////////////////////////// + mConsoleSvc: null, mControlPort: null, mControlHost: null, mControlPassword: null, // JS string that contains hex-encoded password. @@ -1275,6 +1282,15 @@ TorProtocolService.prototype = this.mTorLog.splice(0, 1); } this.mTorLog.push(logObj); + + // We could use console.info(), console.error(), and console.warn() + // but when those functions are used the console output includes + // extraneous double quotes. See Mozilla bug # 977586. + if (this.mConsoleSvc) + { + let s = "Tor " + logObj.type + ": " + logObj.msg; + this.mConsoleSvc.logStringMessage(s); + } break; case "STATUS_CLIENT": this._parseBootstrapStatus(msg);

1 0

[tor-launcher/master] Bug 9516: Show Tor log in TorBrowser
by brade＠torproject.org 31 Jul '14

31 Jul '14

commit 423552fe7009ebe8bd61f92ca525018c124a1b56 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 31 14:18:56 2014 -0400 Bug 9516: Show Tor log in TorBrowser Provide a stopgap solution: route all tor messages captured by Tor Launcher to the Browser Console. --- src/components/tl-protocol.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 85a0165..9c4d957 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -25,6 +25,12 @@ function TorProtocolService() try { + this.mConsoleSvc = Cc["@mozilla.org/consoleservice;1"] + .getService(Ci.nsIConsoleService); + } catch (e) {} + + try + { var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); @@ -496,6 +502,7 @@ TorProtocolService.prototype = // Private Member Variables //////////////////////////////////////////////// + mConsoleSvc: null, mControlPort: null, mControlHost: null, mControlPassword: null, // JS string that contains hex-encoded password. @@ -1295,6 +1302,15 @@ TorProtocolService.prototype = this.mTorLog.splice(0, 1); } this.mTorLog.push(logObj); + + // We could use console.info(), console.error(), and console.warn() + // but when those functions are used the console output includes + // extraneous double quotes. See Mozilla bug # 977586. + if (this.mConsoleSvc) + { + let s = "Tor " + logObj.type + ": " + logObj.msg; + this.mConsoleSvc.logStringMessage(s); + } break; case "STATUS_CLIENT": this._parseBootstrapStatus(msg);

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere version to the 5.0-alpha series.
by mikeperry＠torproject.org 30 Jul '14

30 Jul '14

commit a6ec17d500fadaa6ce9259ac5a7bd8150504e2a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 29 18:41:37 2014 -0700 Bump HTTPS-Everywhere version to the 5.0-alpha series. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 54875ad..4b4a1a2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * Update Tor to 0.2.5.6-alpha * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar - * Update HTTPS Everywhere to 3.5.3 + * Update HTTPS Everywhere to 5.0development.0 * Update Torbutton to 1.6.11.1 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 34c4409..d28bbdc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0development.17 +HTTPSE_VER=5.0development.0 GO_VER=1.3 ## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=eac48781de747a33503c92a36024d910af97fa3264c3912faff282d99da092fb +HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere to 4.0 for the TBB alpha.
by mikeperry＠torproject.org 29 Jul '14

29 Jul '14

commit 7c9c5f63ebc127b651c5bbc146be8d07cf12c961 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 28 19:26:55 2014 -0700 Bump HTTPS-Everywhere to 4.0 for the TBB alpha. --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 69363a3..34c4409 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.3 +HTTPSE_VER=4.0development.17 GO_VER=1.3 ## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 +HTTPSE_HASH=eac48781de747a33503c92a36024d910af97fa3264c3912faff282d99da092fb MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0