- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Move GCM Push prefs within preprocessor guard
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 75c6114151ff3f97595c51e75e07413d06da336a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sun Apr 15 14:19:38 2018 +0000 Bug 25741 - TBA: Move GCM Push prefs within preprocessor guard Otherwise the preprocessor is sad because MOZ_ANDROID_GCM_SENDERID is not defined. We don't need any of this, so we exclude it. --- mobile/android/app/mobile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index a737a1bda4ce..a11e1b033396 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -859,13 +859,13 @@ pref("dom.serviceWorkers.interception.enabled", true); // click on mobile. This is to account for some devices being quite slow. pref("dom.serviceWorkers.disable_open_click_delay", 5000); +#ifdef MOZ_ANDROID_GCM pref("dom.push.debug", false); // The upstream autopush endpoint must have the Google API key corresponding to // the App's sender ID; we bake this assumption directly into the URL. pref("dom.push.serverURL", "https://updates.push.services.mozilla.com/v1/gcm/@MOZ_ANDROID_GCM_SENDERID@"); pref("dom.push.maxRecentMessageIDsPerSubscription", 0); -#ifdef MOZ_ANDROID_GCM pref("dom.push.enabled", true); #endif

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit ce3ad196040db4886e953cf13fc8d24fdf712d4b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 2 17:04:11 2018 +0000 Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files. Based on Orfox initial commits with fixup commits squashed and rebranding Orfox -> Tor Browser See original source from ce3fab3c90eb4a3892181ee36b037da04c785d99 https://github.com/guardianproject/tor-browser.git Dropped symlinks --- .mozconfig-android | 38 +++++++++++++++++++++ .../android/base/locales/en-US/android_strings.dtd | 2 +- mobile/android/branding/torbrowser/configure.sh | 8 +++++ .../android/branding/torbrowser/content/about.png | Bin 0 -> 16858 bytes .../branding/torbrowser/content/favicon32.png | Bin 0 -> 1797 bytes .../branding/torbrowser/content/favicon64.png | Bin 0 -> 3993 bytes mobile/android/branding/torbrowser/content/jar.mn | 9 +++++ .../android/branding/torbrowser/content/moz.build | 7 ++++ mobile/android/branding/torbrowser/ic_launcher.zip | Bin 0 -> 96525 bytes mobile/android/branding/torbrowser/icon.png | Bin 0 -> 36456 bytes .../branding/torbrowser/locales/Makefile.in | 5 +++ .../branding/torbrowser/locales/en-US/brand.dtd | 9 +++++ .../torbrowser/locales/en-US/brand.properties | 7 ++++ mobile/android/branding/torbrowser/locales/jar.mn | 11 ++++++ .../android/branding/torbrowser/locales/moz.build | 7 ++++ mobile/android/branding/torbrowser/moz.build | 7 ++++ .../branding/torbrowser/res/drawable-hdpi/icon.png | Bin 0 -> 3549 bytes .../torbrowser/res/drawable-hdpi/large_icon.png | Bin 0 -> 9558 bytes .../res/drawable-hdpi/launcher_widget.png | Bin 0 -> 14001 bytes .../branding/torbrowser/res/drawable-mdpi/icon.png | Bin 0 -> 2577 bytes .../torbrowser/res/drawable-mdpi/large_icon.png | Bin 0 -> 5878 bytes .../res/drawable-mdpi/launcher_widget.png | Bin 0 -> 7661 bytes .../res/drawable-nodpi/firstrun_welcome.png | Bin 0 -> 48391 bytes .../torbrowser/res/drawable-xhdpi/icon.png | Bin 0 -> 5878 bytes .../torbrowser/res/drawable-xhdpi/large_icon.png | Bin 0 -> 13553 bytes .../res/drawable-xhdpi/launcher_widget.png | Bin 0 -> 21223 bytes .../torbrowser/res/drawable-xhdpi/widget_icon.png | Bin 0 -> 4381 bytes .../torbrowser/res/drawable-xxhdpi/icon.png | Bin 0 -> 9558 bytes .../torbrowser/res/drawable-xxhdpi/large_icon.png | Bin 0 -> 13553 bytes .../res/drawable-xxhdpi/launcher_widget.png | Bin 0 -> 32686 bytes .../torbrowser/res/drawable-xxxhdpi/icon.png | Bin 0 -> 13553 bytes mobile/android/branding/torbrowser/torbrowser.png | Bin 0 -> 55962 bytes mobile/android/branding/torbrowser/torbrowser.xcf | Bin 0 -> 267775 bytes .../mozharness/mozilla/testing/testbase.py | 7 ++-- 34 files changed, 114 insertions(+), 3 deletions(-) diff --git a/.mozconfig-android b/.mozconfig-android new file mode 100755 index 000000000000..efcb1c5415c2 --- /dev/null +++ b/.mozconfig-android @@ -0,0 +1,38 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +mk_add_options MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +# Android +ac_add_options --enable-application=mobile/android +ac_add_options --target=arm-linux-androideabi +ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r15c) +ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location +ac_add_options --with-branding=mobile/android/branding/torbrowser + +if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then + ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +fi + +#enable ccache to set amount of cache assigned for build. +ac_add_options --with-ccache + +ac_add_options --disable-tor-browser-update +ac_add_options --disable-signmar +ac_add_options --disable-verify-mar + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +#ac_add_options --disable-ctypes diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index 917ed534fc9f..b4e2296268c1 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -4,7 +4,7 @@ <!ENTITY firstrun_panel_title_welcome "Welcome"> <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> -<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web."> +<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> <!ENTITY firstrun_privacy_message "Browse like no one\'s watching"> <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/torbrowser/configure.sh new file mode 100644 index 000000000000..79b7e718cbfd --- /dev/null +++ b/mobile/android/branding/torbrowser/configure.sh @@ -0,0 +1,8 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +ANDROID_PACKAGE_NAME=org.torproject.torbrowser +MOZ_APP_DISPLAYNAME="Tor Browser for Android" +MOZ_UPDATER= +MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/torbrowser/content/about.png b/mobile/android/branding/torbrowser/content/about.png new file mode 100644 index 000000000000..3819f6337a17 Binary files /dev/null and b/mobile/android/branding/torbrowser/content/about.png differ diff --git a/mobile/android/branding/torbrowser/content/favicon32.png b/mobile/android/branding/torbrowser/content/favicon32.png new file mode 100644 index 000000000000..0c414d6ca46b Binary files /dev/null and b/mobile/android/branding/torbrowser/content/favicon32.png differ diff --git a/mobile/android/branding/torbrowser/content/favicon64.png b/mobile/android/branding/torbrowser/content/favicon64.png new file mode 100644 index 000000000000..bfc9e05538c6 Binary files /dev/null and b/mobile/android/branding/torbrowser/content/favicon64.png differ diff --git a/mobile/android/branding/torbrowser/content/jar.mn b/mobile/android/branding/torbrowser/content/jar.mn new file mode 100644 index 000000000000..f934ed5e4634 --- /dev/null +++ b/mobile/android/branding/torbrowser/content/jar.mn @@ -0,0 +1,9 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +chrome.jar: +% content branding %content/branding/ + content/branding/about.png (about.png) + content/branding/favicon32.png (favicon32.png) + content/branding/favicon64.png (favicon64.png) diff --git a/mobile/android/branding/torbrowser/content/moz.build b/mobile/android/branding/torbrowser/content/moz.build new file mode 100644 index 000000000000..3bbe6729759c --- /dev/null +++ b/mobile/android/branding/torbrowser/content/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +JAR_MANIFESTS += ['jar.mn'] diff --git a/mobile/android/branding/torbrowser/ic_launcher.zip b/mobile/android/branding/torbrowser/ic_launcher.zip new file mode 100644 index 000000000000..69601344519e Binary files /dev/null and b/mobile/android/branding/torbrowser/ic_launcher.zip differ diff --git a/mobile/android/branding/torbrowser/icon.png b/mobile/android/branding/torbrowser/icon.png new file mode 100644 index 000000000000..6e0051b95a32 Binary files /dev/null and b/mobile/android/branding/torbrowser/icon.png differ diff --git a/mobile/android/branding/torbrowser/locales/Makefile.in b/mobile/android/branding/torbrowser/locales/Makefile.in new file mode 100644 index 000000000000..82f614ecea29 --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/Makefile.in @@ -0,0 +1,5 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DEFINES += -DAB_CD=$(AB_CD) diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.dtd b/mobile/android/branding/torbrowser/locales/en-US/brand.dtd new file mode 100644 index 000000000000..01346be36a7c --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/en-US/brand.dtd @@ -0,0 +1,9 @@ + + +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY vendorShortName "The Tor Project"> + +<!ENTITY brandPocket ""> diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.properties b/mobile/android/branding/torbrowser/locales/en-US/brand.properties new file mode 100644 index 000000000000..3015d2376518 --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/en-US/brand.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#filter +brandShortName=Tor Browser +brandFullName=Tor Browser for Android diff --git a/mobile/android/branding/torbrowser/locales/jar.mn b/mobile/android/branding/torbrowser/locales/jar.mn new file mode 100644 index 000000000000..825dabbfb470 --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/jar.mn @@ -0,0 +1,11 @@ +#filter substitution +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ +# Nightly branding only exists in en-US + locale/branding/brand.dtd (en-US/brand.dtd) +* locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/android/branding/torbrowser/locales/moz.build b/mobile/android/branding/torbrowser/locales/moz.build new file mode 100644 index 000000000000..3bbe6729759c --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +JAR_MANIFESTS += ['jar.mn'] diff --git a/mobile/android/branding/torbrowser/moz.build b/mobile/android/branding/torbrowser/moz.build new file mode 100644 index 000000000000..8f320daeae90 --- /dev/null +++ b/mobile/android/branding/torbrowser/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['content', 'locales'] diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png new file mode 100644 index 000000000000..2a1dc9aea83d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png new file mode 100644 index 000000000000..946e03e42d0b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png new file mode 100644 index 000000000000..4d7dc659a565 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png new file mode 100644 index 000000000000..78ace1c9b6d3 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png new file mode 100644 index 000000000000..8e45a100870b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png new file mode 100644 index 000000000000..23d966478fdf Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png new file mode 100644 index 000000000000..e4e84187e891 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png new file mode 100644 index 000000000000..8e45a100870b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png new file mode 100644 index 000000000000..d3a4929e7503 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png new file mode 100644 index 000000000000..beff04f1fc1d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png new file mode 100644 index 000000000000..ef76eb342035 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png new file mode 100644 index 000000000000..946e03e42d0b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png new file mode 100644 index 000000000000..d3a4929e7503 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png new file mode 100644 index 000000000000..279af3fff38b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png new file mode 100644 index 000000000000..d3a4929e7503 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/torbrowser.png b/mobile/android/branding/torbrowser/torbrowser.png new file mode 100644 index 000000000000..6c6d906aa044 Binary files /dev/null and b/mobile/android/branding/torbrowser/torbrowser.png differ diff --git a/mobile/android/branding/torbrowser/torbrowser.xcf b/mobile/android/branding/torbrowser/torbrowser.xcf new file mode 100644 index 000000000000..2a8f829c3c34 Binary files /dev/null and b/mobile/android/branding/torbrowser/torbrowser.xcf differ diff --git a/testing/mozharness/mozharness/mozilla/testing/testbase.py b/testing/mozharness/mozharness/mozilla/testing/testbase.py index 558c629363f8..1e5c9507a2b3 100755 --- a/testing/mozharness/mozharness/mozilla/testing/testbase.py +++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py @@ -566,8 +566,11 @@ You can set this by: self._download_test_packages(suite_categories, extract_dirs) self._download_installer() - if self.config.get('download_symbols'): - self._download_and_extract_symbols() + # When using --disable-crashreporter the symbols file + # "target.crashreporter-symbols.zip" won't be created, + # so we shouldn't try downloading it (and fail). + #if self.config.get('download_symbols'): + # self._download_and_extract_symbols() # create_virtualenv is in VirtualenvMixin.

1 0

[tor-browser-build/master] Bug 26949: Use GitHub repository for STIX
by gk＠torproject.org 26 Jul '18

26 Jul '18

commit cab964b173814a77f25bfd7ffa8d9adeff4d53fe Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 26 12:27:13 2018 -0400 Bug 26949: Use GitHub repository for STIX STIX moved away from SourceForge to GitHub breaking download during Tor Browser build; see https://lists.torproject.org/pipermail/tor-dev/2018-July/013357.html --- projects/fonts/build | 4 ++-- projects/fonts/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/fonts/build b/projects/fonts/build index 9b33da9..a1e066b 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -13,8 +13,8 @@ mkdir -p $distdir END; %] [% IF c("var/linux") || c("var/osx") %] - unzip -o STIXv1.1.1-latex.zip -d STIX - cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ + unzip -o 2.0.0.zip -d STIX + cp "STIX/stixfonts-2.0.0/archive/STIXv1.1.1/Fonts/STIX-Word/STIXMath-Regular.otf" $distdir/ [% END %] [% IF c("var/linux") %] cp NotoEmoji-Regular.ttf $distdir/ diff --git a/projects/fonts/config b/projects/fonts/config index 1547403..9d11d2c 100644 --- a/projects/fonts/config +++ b/projects/fonts/config @@ -102,6 +102,6 @@ input_files: - URL: https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d02… sha256sum: e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa enable: '[% c("var/linux") %]' - - URL: https://downloads.sourceforge.net/stixfonts/STIXv1.1.1-latex.zip - sha256sum: e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 + - URL: https://github.com/stipub/stixfonts/archive/2.0.0.zip + sha256sum: 4327a16797dabebedce28a9075671730e22c7f74831b24b1fb91e27faec5a235 enable: '[% c("var/linux") || c("var/osx") %]'

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 83eaa0098095411758e3042ffccedbc120c391f9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 24 12:11:09 2018 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. As part of the fix for #9145, we no longer need to set these preferences to disable hardware acceleration. --- browser/app/profile/000-tor-browser.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 49f5909b9d5d..1ab4dd39a13c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -317,11 +317,6 @@ pref("browser.search.geoSpecificDefaults", false); pref("browser.search.order.extra.1", "DuckDuckGo"); pref("browser.search.order.extra.2", "YouTube"); -// Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? -// Nvida cards also experience crashes without the second pref set to disabled -pref("gfx.direct2d.disabled", true); -pref("layers.acceleration.disabled", true); - // Audio_data is deprecated in future releases, but still present // in FF24. This is a dangerous combination (spotted by iSec) pref("media.audio_data.enabled", false);

1 0

[tor-browser-build/master] Bug 9145: Tor Browser for Windows is broken with hardware acceleration
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 11e0e597480bbbd03410431107b26b0492c4fd83 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jun 23 11:21:44 2018 -0400 Bug 9145: Tor Browser for Windows is broken with hardware acceleration We now build with -DWIDL_EXPLICIT_AGGREGATE_RETURNS on Windows to fix this issue; see https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 for more information. --- projects/firefox/mozconfig-windows-i686 | 3 +++ projects/firefox/mozconfig-windows-x86_64 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index daeaed4..a5e15f1 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -1,5 +1,8 @@ CROSS_COMPILE=1 +# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 +export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" + ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --with-toolchain-prefix=i686-w64-mingw32- diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 568d88d..e7f857d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -1,5 +1,8 @@ CROSS_COMPILE=1 +# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 +export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" + ac_add_options --enable-application=browser ac_add_options --target=x86_64-w64-mingw32 ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 51bc401c59cdaa7bf550a8ee955a27253285995e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 28 11:20:05 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 26237: Clean up toolbar for ESR60-based Tor Browser. --- 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 0981831a5c68..49f5909b9d5d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -302,7 +302,7 @@ pref("extensions.getAddons.showPane", false); pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org"); // 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\",\"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}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"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\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"cur rentVersion\":14,\"newElementCount\":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 095707f11202f4fd763853f446b0b0b3988da55c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jun 26 23:41:31 2018 -0700 fixup! Bug 2176: Rebrand Firefox to TorBrowser --- browser/branding/official/default128.png | Bin 12667 -> 20445 bytes browser/branding/official/default16.png | Bin 988 -> 1413 bytes browser/branding/official/default22.png | Bin 1262 -> 1740 bytes browser/branding/official/default24.png | Bin 1430 -> 1969 bytes browser/branding/official/default256.png | Bin 29606 -> 48401 bytes browser/branding/official/default32.png | Bin 2145 -> 2907 bytes browser/branding/official/default48.png | Bin 5402 -> 5190 bytes browser/branding/official/default64.png | Bin 5168 -> 7805 bytes browser/branding/official/firefox64.ico | Bin 38630 -> 75112 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/branding/official/default128.png b/browser/branding/official/default128.png index 84a9b6ff57c0..7113b0ae15cf 100644 Binary files a/browser/branding/official/default128.png and b/browser/branding/official/default128.png differ diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png index 59e34b3157d0..9a6f283b8f05 100644 Binary files a/browser/branding/official/default16.png and b/browser/branding/official/default16.png differ diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png index be56b88fe5e9..a9ef81c47df0 100644 Binary files a/browser/branding/official/default22.png and b/browser/branding/official/default22.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png index 61c067fadf09..fdbbae3fdc0d 100644 Binary files a/browser/branding/official/default24.png and b/browser/branding/official/default24.png differ diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png index 0a73b8061245..1682f54b98fb 100644 Binary files a/browser/branding/official/default256.png and b/browser/branding/official/default256.png differ diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png index f4701edab65d..494951ce50d6 100644 Binary files a/browser/branding/official/default32.png and b/browser/branding/official/default32.png differ diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png index 5f445aea1a19..1b78e3b41967 100644 Binary files a/browser/branding/official/default48.png and b/browser/branding/official/default48.png differ diff --git a/browser/branding/official/default64.png b/browser/branding/official/default64.png index bc68d51b3f95..29cca7e1c881 100644 Binary files a/browser/branding/official/default64.png and b/browser/branding/official/default64.png differ diff --git a/browser/branding/official/firefox64.ico b/browser/branding/official/firefox64.ico index 4db9e72c7589..01fb0efda56d 100644 Binary files a/browser/branding/official/firefox64.ico and b/browser/branding/official/firefox64.ico differ

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26321: New Circuit and New Identity menu items
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 9eef59c878e596b64efff9eafb0cc4bcc38f680c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 23:56:44 2018 -0700 Bug 26321: New Circuit and New Identity menu items Placeholder menu items whose labels and commands are overridden by torbutton patch 26321. --- browser/base/content/browser-menubar.inc | 7 +++++++ browser/components/customizableui/content/panelUI.inc.xul | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index bbae987196c7..f10fc2f4072d 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -34,6 +34,13 @@ accesskey="&newPrivateWindow.accesskey;" command="Tools:PrivateBrowsing" key="key_privatebrowsing"/> + <menuseparator/> +  + <menuitem id="menu_newIdentity" + label="New Identity"/> + <menuitem id="menu_newCircuit" + label="New Tor Circuit for this Site"/> + <menuseparator/> #ifdef MAC_NON_BROWSER_WINDOW <menuitem id="menu_openLocation" label="&openLocationCmd.label;" diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index e44330108bb9..3aab2fd2587d 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -217,6 +217,14 @@ class="subviewbutton subviewbutton-iconic" command="Browser:RestoreLastSession"/> <toolbarseparator/> +  + <toolbarbutton id="appMenuNewIdentity" + label="New Identity" + class="subviewbutton subviewbutton-iconic"/> + <toolbarbutton id="appMenuNewCircuit" + label="New Tor Circuit for this Site" + class="subviewbutton subviewbutton-iconic"/> + <toolbarseparator/> <toolbaritem id="appMenu-zoom-controls" class="toolbaritem-combined-buttons" closemenu="none">  <spacer class="before-label"/>

1 0

[torbutton/master] Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 25786da78e5646ddbccaee769a9356e0b4f39e42 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 14:47:25 2018 -0700 Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus This patch moves the menu items from the torbutton to the menubar and the app menu. Needs the 26321 patch in tor-browser.git. Also hides the "New Private Window" and "Restore Previous Session" items from the app menu. (Design by Pearl Crescent and Antonela Debiasi.) --- src/chrome.manifest | 1 + src/chrome/content/menu-items-overlay.xul | 29 +++++++++++++++++++++++++++++ src/chrome/content/popup.xul | 13 ------------- src/chrome/content/torbutton.js | 12 ++++++++---- src/chrome/skin/torbutton.css | 8 ++++++++ 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 7b57d399..18c5f5b9 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -14,6 +14,7 @@ override chrome://branding/locale/brand.properties chrome://torbutton/locale/bra overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul # UI customization +overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-items-overlay.xul overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul diff --git a/src/chrome/content/menu-items-overlay.xul b/src/chrome/content/menu-items-overlay.xul new file mode 100644 index 00000000..274c9c71 --- /dev/null +++ b/src/chrome/content/menu-items-overlay.xul @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?>  + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + +<overlay id="torbutton-menu-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <menuitem id="menu_newIdentity" + accesskey="&torbutton.context_menu.new_identity_key;" + key="torbutton-new-identity-key" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();"/> + <menuitem id="menu_newCircuit" + accesskey="&torbutton.context_menu.new_circuit_key;" + key="torbutton-new-circuit-key" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();"/> + <toolbarbutton id="appMenuNewIdentity" + key="torbutton-new-identity-key" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();"/> + <toolbarbutton id="appMenuNewCircuit" + key="torbutton-new-circuit-key" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();"/> + <toolbarbutton id="appMenu-private-window-button" + hidden="true"/> + <toolbarbutton id="appMenuRestoreLastSession" + hidden="true"/> +</overlay> diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index b088a829..b4191e30 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -15,19 +15,6 @@ anchor="torbutton-button" position="after_start" > <hbox align="start"> <vbox> - <menuitem id="torbutton-new-identity" - label="&torbutton.context_menu.new_identity;" - accesskey="&torbutton.context_menu.new_identity_key;" - key="torbutton-new-identity-key" - insertafter="context-stop" - oncommand="torbutton_new_identity()"/> - <menuitem id="torbutton-new-circuit" - label="&torbutton.context_menu.new_circuit;" - accesskey="&torbutton.context_menu.new_circuit_key;" - key="torbutton-new-circuit-key" - insertafter="context-stop" - oncommand="torbutton_new_circuit()"/> - <menuseparator/> <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" accesskey="&torbutton.context_menu.cookieProtections.key;" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 885a141a..18895927 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -949,7 +949,8 @@ function torbutton_new_identity() { try { // Make sure that we can only click once on New Identiy to avoid race // conditions leading to failures (see bug 11783 for an example). - document.getElementById("torbutton-new-identity").disabled = true; + document.getElementById("menu_newIdentity").disabled = true; + document.getElementById("appMenuNewIdentity").disabled = true; let shouldConfirm = m_tb_prefs.getBoolPref("extensions.torbutton.confirm_newnym"); @@ -972,7 +973,8 @@ function torbutton_new_identity() { if (confirmed) { torbutton_do_new_identity(); } else { - document.getElementById("torbutton-new-identity").disabled = false; + document.getElementById("menu_newIdentity").disabled = false; + document.getElementById("appMenuNewIdentity").disabled = false; } } else { torbutton_do_new_identity(); @@ -980,7 +982,8 @@ function torbutton_new_identity() { } catch(e) { // If something went wrong make sure we have the New Identity button // enabled (again). - document.getElementById("torbutton-new-identity").disabled = false; + document.getElementById("menu_newIdentity").disabled = false; + document.getElementById("appMenuNewIdentity").disabled = false; torbutton_log(5, "Unexpected error on new identity: "+e); window.alert("Torbutton: Unexpected error on new identity: "+e); } @@ -1769,7 +1772,8 @@ function torbutton_check_protections() document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); if (!m_tb_control_pass || (!m_tb_control_ipc_file && !m_tb_control_port)) { - document.getElementById("torbutton-new-identity").disabled = true; + document.getElementById("menu_newIdentity").disabled = true; + document.getElementById("appMenuNewIdentity").disabled = true; } if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 14166b73..cf90ae6d 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -59,3 +59,11 @@ svg#tor-circuit circle.node-circle { stroke-width: 2px; fill: white; } + +#appMenuNewIdentity { + list-style-image: url("chrome://browser/skin/reload.svg"); +} + +#appMenuNewCircuit { + list-style-image: url("chrome://torbutton/skin/relay.svg"); +}

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26353: Prevent speculative connect that violated FPI.
by gk＠torproject.org 23 Jul '18

23 Jul '18

commit 1b1c4e4143d57a72e02464ac3bc343bd6d57ec9e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jul 14 08:50:55 2018 -0700 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. --- toolkit/components/remotebrowserutils/RemoteWebNavigation.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.js b/toolkit/components/remotebrowserutils/RemoteWebNavigation.js index 9ca238359c0f..8f256f41953d 100644 --- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.js +++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.js @@ -72,6 +72,10 @@ RemoteWebNavigation.prototype = { }, loadURIWithOptions(aURI, aLoadFlags, aReferrer, aReferrerPolicy, aPostData, aHeaders, aBaseURI, aTriggeringPrincipal) { +/******************************************************************************* + TOR BROWSER: Disable the following speculative connect until + we can make it properly obey first-party isolation. + // We know the url is going to be loaded, let's start requesting network // connection before the content process asks. // Note that we might have already setup the speculative connection in some @@ -95,6 +99,7 @@ RemoteWebNavigation.prototype = { // reason (such as failing to parse the URI), just ignore it. } } +*******************************************************************************/ this._sendMessage("WebNavigation:LoadURI", { uri: aURI, flags: aLoadFlags,

1 0