- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 06 Jul '15

06 Jul '15

commit 70dace55470eeed2f6ded5aaa987799a1aecd13e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 6 19:54:22 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16510: Remove "Share this page" from toolbar. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0ea4f6a..78999e4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -185,7 +185,7 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"newElementCount\":0}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"loop-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":4,\"newElementCount\":0}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug #2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 03 Jul '15

03 Jul '15

commit 1861a3a6666878241e348ae537c6776a3b2b25cb Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Oct 24 14:07:03 2014 -0400 fixup! Bug #2176: Rebrand Firefox to TorBrowser Our app display name, "Tor Browser", was truncated to "Tor" within Windows resources (FileDescription, InternalName, and ProductName fields). Fixed by adding quotes around parameters passed to the version_win.pl program. --- config/version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/version.mk b/config/version.mk index 14c76b1..8a44d8f 100644 --- a/config/version.mk +++ b/config/version.mk @@ -15,7 +15,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifndef RESFILE RCFILE=./module.rc RESFILE=./module.res -_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(MOZILLA_DIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION "$(MOZ_APP_VERSION)" +_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(MOZILLA_DIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME "$(MOZ_APP_DISPLAYNAME)" -APPVERSION "$(MOZ_APP_VERSION)" ifdef MOZILLA_OFFICIAL _RC_STRING += -OFFICIAL 1 endif

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 02 Jul '15

02 Jul '15

commit 0acac9dcb78322b77bc16c17802968db8ad668b8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 2 07:16:27 2015 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Remove old .mozconfig cruft --- .mozconfig | 1 - .mozconfig-mingw | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.mozconfig b/.mozconfig index 12c50f3..eb36301 100755 --- a/.mozconfig +++ b/.mozconfig @@ -2,7 +2,6 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/.mozconfig-mingw b/.mozconfig-mingw index dddf07d..392a910 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -1,12 +1,10 @@ -#Specify the cross compile -export CROSS_COMPILE=1 +CROSS_COMPILE=1 ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1

1 0

[tor-browser-bundle/master] Add debug output to authenticode_check script
by gk＠torproject.org 01 Jul '15

01 Jul '15

commit 6cbec232b21da38599438cdb32d865161faf7384 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 1 19:50:55 2015 +0000 Add debug output to authenticode_check script --- tools/authenticode_check.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/authenticode_check.sh b/tools/authenticode_check.sh index 86472ae..646fdce 100755 --- a/tools/authenticode_check.sh +++ b/tools/authenticode_check.sh @@ -71,6 +71,7 @@ for f in `ls *.exe`; do cd tmp if ! [ "$SHA256_TXT" = "`sha256sum $f`" ] then + echo "$f does not have the SHA 256 sum of the unsigned bundle!" BADSIGNED_BUNDLES=`expr $BADSIGNED_BUNDLES + 1` fi cd ..

1 0

[tor-browser-bundle/master] Add fix for bug 13247 to changelog
by gk＠torproject.org 01 Jul '15

01 Jul '15

commit 0530d3eeee374579a1128741ff32afa38b25da5d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 1 09:18:29 2015 +0000 Add fix for bug 13247 to changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9584acd..27d8294 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,7 @@ Tor Browser 5.0a3 -- June 30 2015 * Update Firefox to 38.1.0esr * Update OpenSSL to 1.0.1o * Update NoScript to 2.6.9.27 + * Update meek to 0.20 * Tor patch backport * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com) * Update Torbutton to 1.9.3.0 @@ -16,6 +17,7 @@ Tor Browser 5.0a3 -- June 30 2015 * Bug 16428: Use internal update URL to block updates (instead of 127.0.0.1) * Bug 15145: Visually distinguish "proxy" and "bridge" screens. * Translation updates + * Bug 13247: Fix meek profile error after bowser restarts * Bug 16397: Fix crash related to disabling SVG * Bug 16403: Set search parameters for Disconnect * Bug 16446: Update FTE bridge #1 fingerprint

1 0

[tor-browser-bundle/master] Add additional changelog entries for 5.0a3
by gk＠torproject.org 30 Jun '15

30 Jun '15

commit c23a6e9f5ff90dcbacaf66be6220c25b1d659719 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 30 21:33:12 2015 +0000 Add additional changelog entries for 5.0a3 --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f7f01b7..9584acd 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -35,8 +35,10 @@ Tor Browser 5.0a3 -- June 30 2015 * Bug 16222: Disable WebIDE to prevent remote debugging and addon downloads. * Bug 13024: Disable DOM Resource Timing API * Bug 16340: Disable User Timing API + * Bug 14952: Disable HTTP/2 * Mac OS * Use OSX 10.7 SDK + * Bug 16253: Tor Browser menu on OS X is broken with ESR 38 * Build System * Bug 16351: Upgrade our toolchain to use GCC 5.1 * Bug 15772 and child tickets: Update build system for Firefox 38

1 0

[tor-browser-bundle/master] Binutils 2.25 did not make it into 5.0a3
by gk＠torproject.org 30 Jun '15

30 Jun '15

commit e379172eda433632090681abf7bde3a5d87c52c2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 30 21:00:59 2015 +0000 Binutils 2.25 did not make it into 5.0a3 --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1b9955f..f7f01b7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -38,7 +38,7 @@ Tor Browser 5.0a3 -- June 30 2015 * Mac OS * Use OSX 10.7 SDK * Build System - * Bug 16351: Upgrade our toolchain to use GCC 5.1 and Binutils 2.25 + * Bug 16351: Upgrade our toolchain to use GCC 5.1 * Bug 15772 and child tickets: Update build system for Firefox 38 Tor Browser 4.5.3 -- June 30 2015

1 0

[tor-browser-bundle/master] Update 5.0a3 changelog with preference changes.
by mikeperry＠torproject.org 30 Jun '15

30 Jun '15

commit 417e57406ffd84b4c1e755a4859a31e843c018a8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 30 13:42:24 2015 -0700 Update 5.0a3 changelog with preference changes. --- Bundle-Data/Docs/ChangeLog.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 16c0c62..1b9955f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -13,7 +13,7 @@ Tor Browser 5.0a3 -- June 30 2015 * Bug 16357: Use Mozilla API to wipe permissions db * Translation updates * Update Tor Launcher to 0.2.6.7 - * Bug 16427: Use internal update URL to block updates (instead of 127.0.0.1) + * Bug 16428: Use internal update URL to block updates (instead of 127.0.0.1) * Bug 15145: Visually distinguish "proxy" and "bridge" screens. * Translation updates * Bug 16397: Fix crash related to disabling SVG @@ -31,6 +31,10 @@ Tor Browser 5.0a3 -- June 30 2015 * Bug 7561: Disable FTP request caching * Bug 6503: Fix single-word URL bar searching * Bug 15526: ES6 page crashes Tor Browser + * Bug 16254: Disable GeoIP-based search results. + * Bug 16222: Disable WebIDE to prevent remote debugging and addon downloads. + * Bug 13024: Disable DOM Resource Timing API + * Bug 16340: Disable User Timing API * Mac OS * Use OSX 10.7 SDK * Build System

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #16315: Test spoofed media queries in picture elements
by gk＠torproject.org 29 Jun '15

29 Jun '15

commit 452f870c8dff8089f759c9052960ad7fc73866a0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jun 20 16:10:34 2015 -0700 Bug #16315: Test spoofed media queries in picture elements --- tbb-tests/match.png | Bin 0 -> 1210 bytes tbb-tests/mismatch.png | Bin 0 -> 1573 bytes tbb-tests/mochitest.ini | 3 +++ tbb-tests/test_tor_bug2875.html | 38 ++++++++++++++++++++++++++++++++------ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/tbb-tests/match.png b/tbb-tests/match.png new file mode 100644 index 0000000..d3f299b Binary files /dev/null and b/tbb-tests/match.png differ diff --git a/tbb-tests/mismatch.png b/tbb-tests/mismatch.png new file mode 100644 index 0000000..8f9da3f Binary files /dev/null and b/tbb-tests/mismatch.png differ diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini index 1434f89..2dc049a 100644 --- a/tbb-tests/mochitest.ini +++ b/tbb-tests/mochitest.ini @@ -1,4 +1,7 @@ [DEFAULT] +support-files = + match.png + mismatch.png [test_tor_bug2874.html] [test_tor_bug2875.html] diff --git a/tbb-tests/test_tor_bug2875.html b/tbb-tests/test_tor_bug2875.html index 3c34f3b..5eb3370 100644 --- a/tbb-tests/test_tor_bug2875.html +++ b/tbb-tests/test_tor_bug2875.html @@ -9,7 +9,11 @@ https://trac.torproject.org/projects/tor/ticket/2875 <title>Test for Tor Bug #2875: Limit device and system specific CSS Media Queries</title> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - <script type="application/javascript"> + <script type="application/javascript;version=1.7"> +let test = function () { + + SimpleTest.waitForExplicitFinish(); + var keyValMatches = ([key, val]) => matchMedia("(" + key + ":" + val +")").matches; // Default spoofed values by Tor Browser: @@ -51,23 +55,45 @@ https://trac.torproject.org/projects/tor/ticket/2875 ]; tor_suppressed_toggles.map(key => ok(!keyValMatches([key, 0]) && !keyValMatches([key, 1]), - key + " should not exist.")); + key + " should not exist.")); var foundOSVersion = false; ["windows-xp", "windows-vista", "windows-win7", "windows-win8"].map(function (val) { foundOSVersion = foundOSVersion || keyValMatches(["-moz-os-version", val]); }); ok(!foundOSVersion, "-moz-os-version should have no match"); - + + // Test media queries in picture elements (Tor Bug #16315) + let lines = ""; + for (let [query, expected] of tor_defaults) { + lines += "<picture>\n"; + lines += " <source srcset='match.png' media='(" + query + ": " + expected + ")'>\n"; + lines += " <img class='testImage' src='mismatch.png' alt='" + query + "'>\n"; + lines += "</picture><br>\n"; + } + document.getElementById("content").innerHTML += lines; + var testImages = document.getElementsByClassName("testImage"); + window.setTimeout(function () { + for (let testImage of testImages) { + ok(testImage.currentSrc.endsWith("/match.png"), "Media query in picture should match."); + } + SimpleTest.finish(); + }, 0); + +}; + </script> </head> <body> <a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/2875">Tor Bug 2875</a> <p id="display"></p> -<div id="content" style="display: none"> - -</div> +<div id="content"></div> <pre id="test"> </pre> +<script> + window.onload = function () { + test(); + } +</script> </body> </html>

1 0

[tor-browser-bundle/master] No need for the dev/urandom patch anymore
by gk＠torproject.org 29 Jun '15

29 Jun '15

commit 77299592b1c7aaf46f4c99c63ad855d0852e8e3b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 29 15:27:49 2015 +0000 No need for the dev/urandom patch anymore This got upstreamed into GCC 5. --- gitian/patches/gcc-dev-random.patch | 72 ----------------------------------- 1 file changed, 72 deletions(-) diff --git a/gitian/patches/gcc-dev-random.patch b/gitian/patches/gcc-dev-random.patch deleted file mode 100644 index 9757f92..0000000 --- a/gitian/patches/gcc-dev-random.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b0ce14899060267b5b5e4d7e3d91edcdf5c09514 Mon Sep 17 00:00:00 2001 -From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Tue, 10 Feb 2015 01:44:08 +0000 -Subject: [PATCH] * ssp.c (__guard_setup): For Windows, use approved methods - to get a suitable random number for the stack check guard - rather than reading /dev/random. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220559 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libssp/ChangeLog | 7 +++++++ - libssp/ssp.c | 16 ++++++++++++++++ - 2 files changed, 23 insertions(+) - -diff --git a/libssp/ChangeLog b/libssp/ChangeLog -index a445537..676d2a7 100644 ---- a/libssp/ChangeLog -+++ b/libssp/ChangeLog -@@ -1,3 +1,10 @@ -+2015-02-09 Georg Koppen <gk(a)torproject.org> -+ -+ * ssp.c: Conditionally include <windows.h> -+ (__guard_setup): For Windows, use approved methods to get -+ a suitable random number for the stack check guard rather -+ than reading /dev/random. -+ - 2014-07-16 Release Manager - - * GCC 4.9.1 released. -diff --git a/libssp/ssp.c b/libssp/ssp.c -index 96adf17..38e3ec8 100644 ---- a/libssp/ssp.c -+++ b/libssp/ssp.c -@@ -55,6 +55,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* Native win32 apps don't know about /dev/tty but can print directly - to the console using "CONOUT$" */ - #if defined (_WIN32) && !defined (__CYGWIN__) -+#include <windows.h> - # define _PATH_TTY "CONOUT$" - #else - # define _PATH_TTY "/dev/tty" -@@ -75,6 +76,20 @@ __guard_setup (void) - if (__stack_chk_guard != 0) - return; - -+#if defined (_WIN32) && !defined (__CYGWIN__) -+ HCRYPTPROV hprovider = 0; -+ if (CryptAcquireContext(&hprovider, NULL, NULL, PROV_RSA_FULL, -+ CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) -+ { -+ if (CryptGenRandom(hprovider, sizeof (__stack_chk_guard), -+ (BYTE *)&__stack_chk_guard) && __stack_chk_guard != 0) -+ { -+ CryptReleaseContext(hprovider, 0); -+ return; -+ } -+ CryptReleaseContext(hprovider, 0); -+ } -+#else - fd = open ("/dev/urandom", O_RDONLY); - if (fd != -1) - { -@@ -85,6 +100,7 @@ __guard_setup (void) - return; - } - -+#endif - /* If a random generator can't be used, the protector switches the guard - to the "terminator canary". */ - p = (unsigned char *) &__stack_chk_guard; --- -1.7.10.4 -

1 0