- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Cleaning up gk's key
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 2dcef4073f367121ba4a4e80a0a62892ffb011c7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:20:27 2016 +0000 Cleaning up gk's key --- gitian/gpg/gk.gpg | Bin 72418 -> 41255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 2f78b14..9037e43 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/maint-6.0] Cleaning up gk's key
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit dc8a94bd5979fdbc3e4819e7948a8424cee72688 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:20:27 2016 +0000 Cleaning up gk's key --- gitian/gpg/gk.gpg | Bin 72418 -> 41255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 2f78b14..9037e43 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser/tor-browser-45.3.0esr-6.0-1] Bug 19890: Disable installation of system addons
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 61700466ddefff3005633a6e31f34133eb98197f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:00:24 2016 +0000 Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. --- browser/app/profile/firefox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 1dd964b..6e424cb 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -69,8 +69,8 @@ pref("extensions.hotfix.cert.checkAttributes", true); pref("extensions.hotfix.certs.1.sha1Fingerprint", "91:53:98:0C:C1:86:DF:47:8F:35:22:9E:11:C9:A7:31:04:49:A1:AA"); pref("extensions.hotfix.certs.2.sha1Fingerprint", "39:E7:2B:7A:5B:CF:37:78:F9:5D:4A:E0:53:2D:2F:3D:68:53:C5:60"); -// Check AUS for system add-on updates. -pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_…"); +// No AUS check for system add-on updates for Tor Browser users. +pref("extensions.systemAddon.update.url", ""); // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here.

1 0

[tor-browser-bundle/hardened-builds] Bug 19818: add config.yml option for the releases directory path
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit fcf89874d5b9919633d312e89d8aea529f5664d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 11:50:38 2016 +0200 Bug 19818: add config.yml option for the releases directory path --- tools/update-responses/config.yml | 1 + tools/update-responses/update_responses | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 8eaeae6..191c246 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,5 @@ --- +releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1a7cb14..cf307da 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -30,7 +30,8 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; -my $releases_dir = "$FindBin::Bin/../../gitian"; +my $releases_dir = $config->{releases_dir}; +$releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; sub exit_error {

1 0

[tor-browser-bundle/maint-6.0] Bug 19818: add config.yml option for the releases directory path
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 1bb5bba64b60009c3deb8cc5119dd41d7615f3d4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 11:50:38 2016 +0200 Bug 19818: add config.yml option for the releases directory path --- tools/update-responses/config.yml | 1 + tools/update-responses/update_responses | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 16843df..36192fc 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,5 @@ --- +releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1a7cb14..cf307da 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -30,7 +30,8 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; -my $releases_dir = "$FindBin::Bin/../../gitian"; +my $releases_dir = $config->{releases_dir}; +$releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; sub exit_error {

1 0

[tor-browser-bundle/master] Bug 19818: add config.yml option for the releases directory path
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 260c051a69a7323084793c23c6ed53cd1344dd72 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 11:50:38 2016 +0200 Bug 19818: add config.yml option for the releases directory path --- tools/update-responses/config.yml | 1 + tools/update-responses/update_responses | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 7b92a72..59b9179 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,5 @@ --- +releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1a7cb14..cf307da 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -30,7 +30,8 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; -my $releases_dir = "$FindBin::Bin/../../gitian"; +my $releases_dir = $config->{releases_dir}; +$releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; sub exit_error {

1 0

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

11 Aug '16

commit 219b21731bec577b8797a8914612f0ae9e55d1ad Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 10 13:43:25 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Improve the about:tbupdate page: Show the browser name and version in the upper right corner (bug 19835). Use bold text in a couple of places (bug 19336). --- browser/base/content/abouttbupdate/aboutTBUpdate.css | 20 ++++++++++++++++++++ .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 4 +++- browser/base/content/tab-content.js | 13 +++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index 489c9d2..c171c58 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -6,6 +6,20 @@ body { background-size: 100% 100%; } +#torbrowser-version { + /* These CSS rules match the about:tor page */ + position: fixed; + top: 6px; + right: 6px; + height: 30px; + width: 200px; + white-space: pre-wrap; + text-align: right; + color: #4d4d4d; + font-family: "Liberation Sans", Arial, Helvetica, sans-serif; + font-size: 14px; +} + #logo { background-image: url("chrome://browser/content/abouttbupdate/aboutTBUpdateLogo.png"); height: 128px; @@ -21,6 +35,7 @@ body { #msg-updated { font-size: 120%; + font-weight: bold; margin-bottom: 20px; } @@ -28,6 +43,11 @@ body { margin: 0px 20px 20px 20px; } +#changelog-heading { + font-weight: bold; + margin-bottom: 4px; +} + #changelog { margin-left: 20px; white-space: pre; diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index 3a29e0c..115ec40 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -20,6 +20,7 @@ type="text/javascript;version=1.7"/> </head> <body dir="&locale.dir;" onload="init()"> +<div id="torbrowser-version"/> <div id="logo"/> <div id="msg"> <div id="msg-updated">&aboutTBUpdate.updated;</div> @@ -27,7 +28,8 @@ </div> </div> <br clear="all"/> -<div id="changelog-container">&aboutTBUpdate.changeLogHeading; +<div id="changelog-container"> +<div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> <div id="changelog"></div> </div> </body> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index 44489a2..b0f960a 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -5,6 +5,11 @@ /* This content script contains code that requires a tab browser. */ +#ifdef TOR_BROWSER_VERSION +# Add double-quotes back on (stripped by JarMaker.py). +#expand const TOR_BROWSER_VERSION = "__TOR_BROWSER_VERSION__"; +#endif + var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -391,6 +396,14 @@ let AboutTBUpdateListener = { let doc = content.document; doc.getElementById("infolink").setAttribute("href", this.getPostUpdateURL()); doc.getElementById("changelog").textContent = this.getChangeLogText(); + + const kBrandBundle = "chrome://branding/locale/brand.properties"; + let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService) + .createBundle(kBrandBundle); + let productName = brandBundle.GetStringFromName("brandFullName"); + doc.getElementById("torbrowser-version").textContent = productName + "\n" + + TOR_BROWSER_VERSION; }, // Extract the post update URL from this page's query string.

1 0

[tor-browser-bundle/master] Folding in changelogs
by gk＠torproject.org 09 Aug '16

09 Aug '16

commit c5862ce43fab3ae20546456fb294ae84cf6941cd Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 9 08:40:30 2016 +0000 Folding in changelogs --- Bundle-Data/Docs/ChangeLog.txt | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index eb79991..c0abf86 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 6.5a2-hardened -- August 3 + * All Platforms + * Update Firefox to 45.3.0esr + * Update Tor to tor-0.2.8.5-rc + * Update Torbutton to 1.9.6.1 + * Bug 19689: Use proper parent window for plugin prompt + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + * Update HTTPS-Everywhere to 5.2.1 + * Update NoScript to 2.9.0.12 + * Bug 17406: Include Selfrando into our hardened builds + * Bug 19417: Disable asmjs for now + * Bug 19715: Disable the meek-google pluggable transport option + * Bug 19714: Remove mercurius4 obfs4 bridge + * Bug 19585: Fix regression test for keyboard layout fingerprinting + * Bug 19515: Tor Browser is crashing in graphics code + * Bug 18513: Favicon requests can bypass New Identity + * Bug 19273: Write C++ patch for external app launch handling + * Bug 16998: Isolate preconnect requests to URL bar domain + * Bug 18923: Add script to run all Tor Browser regression tests + * Bug 19478: Prevent millisecond resolution leaks in File API + * Bug 19401: Fix broken PDF download button + * Bug 19411: Don't show update icon if a partial update failed + * Bug 19400: Back out GCC bug workaround to avoid asmjs crash + * Bug 19735: Switch default search engine to DuckDuckGo + * Bug 19276: Disable Xrender due to possible performance regressions + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x + * Build System + * All Platforms + * Bug 19703: Upgrade Go to 1.6.3 + Tor Browser 6.5a2 -- August 3 * All Platforms * Update Firefox to 45.3.0esr @@ -38,6 +71,25 @@ Tor Browser 6.5a2 -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 +Tor Browser 6.0.3 -- August 2 + * All Platforms + * Update Firefox to 45.3.0esr + * Update Torbutton to 1.9.5.6 + * Bug 19417: Disable asmjs for now + * Bug 19689: Use proper parent window for plugin prompt + * Update HTTPS-Everywhere to 5.2.1 + * Update NoScript to 2.9.0.12 + * Bug 19417: Disable asmjs for now + * Bug 19715: Disable the meek-google pluggable transport option + * Bug 19714: Remove mercurius4 obfs4 bridge + * Bug 19585: Fix regression test for keyboard layout fingerprinting + * Bug 19515: Tor Browser is crashing in graphics code + * Bug 18513: Favicon requests can bypass New Identity + * OS X + * Bug 19269: Icon doesn't appear in Applications folder or Dock + * Android + * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined + Tor Browser 6.0.2 -- June 21 * All Platforms * Update Torbutton to 1.9.5.5

1 0

[tor-browser-bundle/master] Bump versions for nightlies
by gk＠torproject.org 02 Aug '16

02 Aug '16

commit edfaa1e39cb9cfc3d0c019116b98e71aa9c788eb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 2 09:50:36 2016 +0000 Bump versions for nightlies --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7d66421..749f8ea 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -54,7 +54,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -75,7 +75,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -109,7 +109,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/hardened-builds] correcting mirror
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit f7fda5e4d6c0cb5147cf4b8629aac1a877ae5bff Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 13:23:20 2016 +0000 correcting mirror --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 4d48089..c663051 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,7 +6,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ -MIRROR_URL_GK=https://people.torproject.org/~asn/mirrors/sources/ +MIRROR_URL_GK=https://people.torproject.org/~gk/mirrors/sources/ set -e set -u umask 0022

1 0