- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Conditionally require WIFI and NETWORK permissions
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 2f95c5a75f74fb9f34c60940a5e1285162f696d5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 11 17:52:59 2018 +0000 Bug 25741 - TBA: Conditionally require WIFI and NETWORK permissions Only require the {ACCESS,CHANGE}_WIFI_STATE and ACCESS_NETWORK_STATE permissions if MOZ_ANDROID_NETWORK_STATE is defined in the preprocessor. --- mobile/android/base/FennecManifest_permissions.xml.in | 3 +++ mobile/android/geckoview/src/main/AndroidManifest.xml | 2 ++ mobile/android/moz.configure | 4 ++++ .../services/manifests/FxAccountAndroidManifest_permissions.xml.in | 2 ++ mobile/android/torbrowser.configure | 2 ++ 5 files changed, 13 insertions(+) diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index 94bd1b39e0e0..747f1e988147 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -8,8 +8,11 @@ (potentially) of the push feature. --> #include GcmAndroidManifest_permissions.xml.in +#ifdef MOZ_ANDROID_NETWORK_STATE +  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> +#endif <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index c99c76efdd57..2a84ae4611ad 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -1,11 +1,13 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.geckoview"> +#ifdef MOZ_ANDROID_NETWORK_STATE <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> +#endif <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index df9eb2038075..468ec4723632 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -185,3 +185,7 @@ def check_android_gcm(android_gcm, if not google_play_services: die('You must specify --with-google-play-services when' ' building with MOZ_ANDROID_GCM=1') + +project_flag('MOZ_ANDROID_NETWORK_STATE', + help='Include permission for accessing WiFi/network state on Android', + default=False) diff --git a/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in b/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in index d5c7e3e5c7dc..8498b8015855 100644 --- a/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in +++ b/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in @@ -1,5 +1,7 @@ <uses-permission android:name="android.permission.GET_ACCOUNTS" /> +#ifdef MOZ_ANDROID_NETWORK_STATE <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> +#endif <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> diff --git a/mobile/android/torbrowser.configure b/mobile/android/torbrowser.configure index 5e3ab67dca6a..3e84355774d5 100644 --- a/mobile/android/torbrowser.configure +++ b/mobile/android/torbrowser.configure @@ -41,3 +41,5 @@ imply_option('MOZ_SERVICES_HEALTHREPORT', False) # them here, as well. #imply_option('MOZ_TELEMETRY_REPORTING', False) #imply_option('MOZ_DATA_REPORTING', False) + +imply_option('MOZ_ANDROID_NETWORK_STATE', False);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Disable telemetry and experiments
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 58ed6fff3b06e225b55d0af80ba399a0eba11e9e Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 9 21:57:22 2018 +0000 Bug 25741 - TBA: Disable telemetry and experiments --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 0cf5aa15b0e1..ce2f1c5908b8 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -71,6 +71,7 @@ import android.widget.Button; import android.widget.ListView; import android.widget.ViewFlipper; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.AppConstants.Versions; import org.mozilla.gecko.DynamicToolbar.VisibilityTransition; import org.mozilla.gecko.Tabs.TabEvents; @@ -703,7 +704,11 @@ public class BrowserApp extends GeckoApp showSplashScreen = true; final SafeIntent intent = new SafeIntent(getIntent()); - final boolean isInAutomation = IntentUtils.getIsInAutomationFromEnvironment(intent); + // TBA: Disable Switchboard testing experiments and + // Telemetry-uploading by abusing the isInAutomation detection. + final boolean isInAutomation = + (IntentUtils.getIsInAutomationFromEnvironment(intent) + || AppConstants.isTorBrowser()); GeckoProfile.setIntentArgs(intent.getStringExtra("args"));

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Remove sync option from preferences
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 99f346a73bde893c862bbb6504ff52f63b5b60e0 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Fri Jul 17 13:27:07 2015 -0400 Bug 25741 - TBA: Remove sync option from preferences We don't want this while the Sync subsystem is a proxy-bypass risk. We can drop this when the feature is patched. Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/app/src/main/res/xml/preferences.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mobile/android/app/src/main/res/xml/preferences.xml b/mobile/android/app/src/main/res/xml/preferences.xml index 06716cd9af91..08ee14ea443a 100644 --- a/mobile/android/app/src/main/res/xml/preferences.xml +++ b/mobile/android/app/src/main/res/xml/preferences.xml @@ -9,12 +9,6 @@ xmlns:gecko="http://schemas.android.com/apk/res-auto" android:enabled="false"> - <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync" - android:title="@string/pref_sync" - android:icon="@drawable/sync_avatar_default" - android:summary="@string/pref_sync_summary" - android:persistent="false" /> - <PreferenceScreen android:title="@string/pref_category_general" android:summary="@string/pref_category_general_summary" android:key="android.not_a_preference.general_screen"

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit b5a6b33814d32a25a41b0d21f02447e1b630ec4f Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Jan 19 23:49:11 2018 +0000 Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs --- .eslintignore | 3 ++ mobile/android/app/000-tor-browser-android.js | 58 +++++++++++++++++++++++++++ mobile/android/app/mobile.js | 4 ++ mobile/android/app/moz.build | 1 + mobile/android/installer/package-manifest.in | 1 + 5 files changed, 67 insertions(+) diff --git a/.eslintignore b/.eslintignore index 3fcc46db7ded..69f27d2366ec 100644 --- a/.eslintignore +++ b/.eslintignore @@ -326,6 +326,9 @@ media/webrtc/trunk/** # mobile/android/ exclusions mobile/android/tests/browser/chrome/tp5/** +# uses `#include` +mobile/android/app/000-tor-browser-android.js + # Uses `#filter substitution` mobile/android/app/mobile.js mobile/android/app/geckoview-prefs.js diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js new file mode 100644 index 000000000000..399c6f07718b --- /dev/null +++ b/mobile/android/app/000-tor-browser-android.js @@ -0,0 +1,58 @@ +// Import all prefs from the canonical file +// We override mobile-specific prefs below +// Tor Browser for Android +// Do not edit this file. + +#include ../../../browser/app/profile/000-tor-browser.js + + +// Disable Presentation API +pref("dom.presentation.controller.enabled", false); +pref("dom.presentation.enabled", false); +pref("dom.presentation.discoverable", false); +pref("dom.presentation.discoverable.encrypted", false); +pref("dom.presentation.discovery.enabled", false); +pref("dom.presentation.receiver.enabled", false); + +pref("dom.audiochannel.audioCompeting", false); +pref("dom.audiochannel.mediaControl", false); + +// Space separated list of URLs that are allowed to send objects (instead of +// only strings) through webchannels. This list is duplicated in browser/app/profile/firefox.js +pref("webchannel.allowObject.urlWhitelist", ""); + +// Disable browser auto updaters +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("browser.startup.homepage_override.mstone", "ignore"); + +// Clear data on quit +pref("privacy.clearOnShutdown.cache", true); +pref("privacy.clearOnShutdown.cookies",true); +pref("privacy.clearOnShutdown.downloads",true); +pref("privacy.clearOnShutdown.formdata",true); +pref("privacy.clearOnShutdown.history",true); +pref("privacy.clearOnShutdown.offlineApps",true); +pref("privacy.clearOnShutdown.passwords",true); +pref("privacy.clearOnShutdown.sessions",true); +pref("privacy.clearOnShutdown.siteSettings",true); + +// Disable Control media casting & mirroring features +pref("browser.casting.enabled", false); +pref("browser.mirroring.enabled", false); + +// Disable autoplay +pref("media.autoplay.enabled", false); + +// controls if we want camera support +pref("device.camera.enabled", false); +pref("media.realtime_decoder.enabled", false); + +// Do not fetch updated per-site user-agent strings from Mozilla +// See ua-update.json.in for the packaged UA override list +// See https://bugzilla.mozilla.org/show_bug.cgi?id=897221 +pref("general.useragent.updates.enabled", false); +pref("general.useragent.updates.url", ""); + +// Override this because Orbot uses 9050 as the default +pref("network.proxy.socks_port", 9050); diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index a11e1b033396..052ebdec5948 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -504,7 +504,11 @@ pref("app.update.timerMinimumDelay", 30); // seconds // used by update service to decide whether or not to // automatically download an update pref("app.update.autodownload", "wifi"); +#ifdef TOR_BROWSER_VERSION +pref("app.update.url.android", ""); +#else pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TAR…"); +#endif #ifdef MOZ_UPDATER /* prefs used specifically for updating the app */ diff --git a/mobile/android/app/moz.build b/mobile/android/app/moz.build index 8ff152f3b369..773c1a3979a8 100644 --- a/mobile/android/app/moz.build +++ b/mobile/android/app/moz.build @@ -49,6 +49,7 @@ if CONFIG['MOZ_PKG_SPECIAL']: DEFINES['MOZ_PKG_SPECIAL'] = CONFIG['MOZ_PKG_SPECIAL'] JS_PREFERENCE_PP_FILES += [ + '000-tor-browser-android.js', 'geckoview-prefs.js', 'mobile.js', ] diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 6f6a02082bec..8a2a356c151c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -431,6 +431,7 @@ #ifdef MOZ_GECKOVIEW_JAR @BINPATH@/@PREF_DIR@/geckoview-prefs.js #else +@BINPATH@/@PREF_DIR@/000-tor-browser-android.js @BINPATH@/@PREF_DIR@/mobile.js #endif @BINPATH@/@PREF_DIR@/channel-prefs.js

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Do not register Stumbler listener at start up
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 2fd232288ac877e67fabf6c52ec1d85b87533446 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 25 01:55:44 2018 +0000 Bug 25741 - TBA: Do not register Stumbler listener at start up --- mobile/android/base/java/org/mozilla/gecko/GeckoApp.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 7e04484ac5bc..1f2f95490d0a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -979,9 +979,12 @@ public abstract class GeckoApp extends GeckoActivity // Tell Stumbler to register a local broadcast listener to listen for preference intents. // We do this via intents since we can't easily access Stumbler directly, // as it might be compiled outside of Fennec. - getApplicationContext().sendBroadcast( + // TBA: We don't want Fennec using or receiving Stumbler + if (!AppConstants.isTorBrowser()) { + getApplicationContext().sendBroadcast( new Intent(INTENT_REGISTER_STUMBLER_LISTENER) - ); + ); + } // Did the OS locale change while we were backgrounded? If so, // we need to die so that Gecko will re-init add-ons that touch @@ -1025,6 +1028,7 @@ public abstract class GeckoApp extends GeckoActivity final String uri = getURIFromIntent(intent); if (!TextUtils.isEmpty(uri)) { // Start a speculative connection as soon as Gecko loads. + // XXX TBA: Check this doesn't leak, and is blocked by Tor bootstrap GeckoThread.speculativeConnect(uri); } }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Add default configure options in dedicated file
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit da8531b4015da74d3ebc2e4218a6f7a6455b3328 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Jan 22 11:18:45 2018 +0000 Bug 25741 - TBA: Add default configure options in dedicated file --- mobile/android/moz.configure | 9 ++++++-- mobile/android/torbrowser.configure | 43 +++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 034810e966dc..df9eb2038075 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -112,9 +112,12 @@ option(env='MOZ_ANDROID_MOZILLA_ONLINE', set_config('MOZ_ANDROID_MOZILLA_ONLINE', depends_if('MOZ_ANDROID_MOZILLA_ONLINE')(lambda _: True)) -imply_option('MOZ_SERVICES_HEALTHREPORT', True) -imply_option('MOZ_ANDROID_HISTORY', True) imply_option('--enable-small-chunk-size', True) +# Comment these so we can imply |False| in torbrowser.configure +# The Build system doesn't allow multiple imply_option() +# calls with the same key. +#imply_option('MOZ_SERVICES_HEALTHREPORT', True) +#imply_option('MOZ_ANDROID_HISTORY', True) set_config('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0') add_old_configure_assignment('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0') @@ -128,6 +131,8 @@ def check_target(target): 'Build_Instructions/Simple_Firefox_for_Android_build ' 'for more information about the necessary options.') +include('torbrowser.configure') + include('../../toolkit/moz.configure') include('../../build/moz.configure/java.configure') include('gradle.configure') diff --git a/mobile/android/torbrowser.configure b/mobile/android/torbrowser.configure new file mode 100644 index 000000000000..5e3ab67dca6a --- /dev/null +++ b/mobile/android/torbrowser.configure @@ -0,0 +1,43 @@ +# -*- Mode: python; 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/. + +# Set Tor Browser default config + +# Disable Android Beam (NFC integration) +imply_option('MOZ_ANDROID_BEAM', False) + + +imply_option('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE', False) +imply_option('MOZ_ANDROID_DOWNLOADS_INTEGRATION', False) +imply_option('MOZ_ANDROID_EXCLUDE_FONTS', False) + +# Disable push notifications/messaging on nightly +imply_option('MOZ_ANDROID_GCM', False) + +# Disable all history/bookmark/icon caching +# (both in local sqlite DB and with Android integration) +imply_option('MOZ_ANDROID_HISTORY', False) +imply_option('MOZ_PLACES', False) + +# Disable the stumbler, Firefox shouldn't touch the network +imply_option('MOZ_ANDROID_MLS_STUMBLER', False) + +# Disable uploading crash reports and dump files to an external server +# This is still configured in old-configure. Uncomment when this moves +# to the python config +#imply_option('MOZ_CRASHREPORTER', False) + +# Disable uploading information about the browser configuration and +# performance to an external server +imply_option('MOZ_SERVICES_HEALTHREPORT', False) + +# Disable creating telemetry and data reports that are uploaded to an +# external server +# These aren't actually configure options. These are disabled in +# confvars.sh, but they look like configure options so we'll document +# them here, as well. +#imply_option('MOZ_TELEMETRY_REPORTING', False) +#imply_option('MOZ_DATA_REPORTING', False)

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Disable features at compile-time
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 377b11c036a42e4157e02ab8aaa8b1fc9a8cd45b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 9 19:48:12 2018 +0000 Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Document two remaining but unused defines: MOZ_CAPTURE MOZ_XULRUNNER --- mobile/android/confvars.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index e1b507396c84..43062e7352c6 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -30,9 +30,14 @@ MOZ_ANDROID_BROWSER_INTENT_CLASS=org.mozilla.gecko.BrowserApp MOZ_NO_SMART_CARDS=1 +# TBA: MOZ_XULRUNNER and MOZ_CAPTURE defines are dead/unused, leaving here for easier future rebasing +# Bug 1478438 + MOZ_XULRUNNER= MOZ_CAPTURE=1 + +# Adds MIME-type support for raw video MOZ_RAW=1 # use custom widget for html:select @@ -42,3 +47,15 @@ MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110} # Enable checking that add-ons are signed by the trusted root MOZ_ADDON_SIGNING=1 + +### Tor Browser for Android ### + +# Disables support at compile-time for casting (Mozilla Media Manager) +# and prevents dependency on Google Play Services support +unset MOZ_NATIVE_DEVICES + +# Disable telemetry at compile-time +unset MOZ_TELEMETRY_REPORTING + +# Disable data reporting at compile-time +unset MOZ_DATA_REPORTING

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Add an AppConstant for TOR_BROWSER_VERSION
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit b148406e9e358c325e008a22454fe13c416e5789 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Jan 19 20:13:58 2018 +0000 Bug 25741 - TBA: Add an AppConstant for TOR_BROWSER_VERSION --- .../java/org/mozilla/gecko/TorBrowserTest.java | 27 ++++++++++++++++++++++ mobile/android/base/AppConstants.java.in | 15 ++++++++++++ mobile/android/base/generate_build_config.py | 3 ++- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/TorBrowserTest.java b/mobile/android/app/src/test/java/org/mozilla/gecko/TorBrowserTest.java new file mode 100644 index 000000000000..15ee5aa1b70f --- /dev/null +++ b/mobile/android/app/src/test/java/org/mozilla/gecko/TorBrowserTest.java @@ -0,0 +1,27 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +package org.mozilla.gecko; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mozilla.gecko.background.testhelpers.TestRunner; +import org.mozilla.gecko.AppConstants; + +import static org.junit.Assert.*; + +(a)RunWith(TestRunner.class) +public class TorBrowserTest { + /** + * Tests the compile-time constants are set. + */ + @Test + public void testIsTorBrowser() { + assertTrue(AppConstants.isTorBrowser()); + } + + @Test + public void testTorBrowserVersion() { + assertEquals(AppConstants.TOR_BROWSER_VERSION, "8.0"); + } +} diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index 34e483a6db77..79f81257dade 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -338,4 +338,19 @@ public class AppConstants { //#else null; //#endif + + public static final String TOR_BROWSER_VERSION = +//#ifdef TOR_BROWSER_VERSION + "@TOR_BROWSER_VERSION@"; +//#else + null; +//#endif + + public static final boolean isTorBrowser() { +//#ifdef TOR_BROWSER_VERSION + return true; +//#else + return false; +//#endif + } } diff --git a/mobile/android/base/generate_build_config.py b/mobile/android/base/generate_build_config.py index f5f499b09aed..61e5f91aa6e4 100644 --- a/mobile/android/base/generate_build_config.py +++ b/mobile/android/base/generate_build_config.py @@ -64,7 +64,8 @@ def _defines(): 'MOZ_ANDROID_MAX_SDK_VERSION', 'MOZ_ANDROID_MIN_SDK_VERSION', 'MOZ_PKG_SPECIAL', - 'MOZ_UPDATER'): + 'MOZ_UPDATER', + 'TOR_BROWSER_VERSION'): if CONFIG[var]: DEFINES[var] = CONFIG[var]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Exclude unwanted Stumbler tests
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 214bccd0cd359301724fe13d3979c1d1911be6ad Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 16 13:47:48 2018 +0000 Bug 25741 - TBA: Exclude unwanted Stumbler tests When the stumbler service is ifdef-disabled because MOZ_ANDROID_MLS_STUMBLER is not defined, then the unit test compilation fails because some values are never declared and defined. We exclude all testStumbler*.java files from the robocop gecko test source tree. --- mobile/android/app/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index f18e933a03d2..7c515bbe65a7 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -186,6 +186,11 @@ android { androidTest { java { srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/src" + + if (!mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) { + exclude 'org/mozilla/gecko/tests/testStumbler*.java' + } + // Bug 1229149 tracks pushing this into a :services Gradle project. srcDir "${topsrcdir}/mobile/android/services/src/androidTest/java" srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src"

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/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-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

[tor-browser/tor-browser-60.1.0esr-8.0-1] Revert "Fix MAR generation bashism"
by gk＠torproject.org 23 Jul '18

23 Jul '18

commit d94df634a18daca48ce92bf7ddff306a2b072f83 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 23 09:20:04 2018 +0000 Revert "Fix MAR generation bashism" This reverts commit 9ebb4cfb3d88543eac674bef8b72607cf29ce2d0. --- tools/update-packaging/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index 79548dd4aa19..388d6b186367 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -218,7 +218,7 @@ list_files() { continue; fi eval "${1}[$count]=\"$file\"" - count=$((count + 1)) + (( count++ )) done <"${tmpfile}" rm -f "${tmpfile}" }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 23 Jul '18

23 Jul '18

commit 3ea5140e0bb662dee230a99c8fceaadb51e93ae1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 27 09:52:42 2018 -0400 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Part of the fix for #26216. --- tools/update-packaging/make_full_update.sh | 2 -- tools/update-packaging/make_incremental_update.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 9faa067da528..97e5fe221e40 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -8,8 +8,6 @@ # Author: Darin Fisher # -set -e - # shellcheck disable=SC1090 . "$(dirname "$0")/common.sh" diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 263ec5aa4a56..822ded71d949 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -8,8 +8,6 @@ # Author: Darin Fisher # -set -e - # shellcheck disable=SC1090 . "$(dirname "$0")/common.sh"

1 0

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

23 Jul '18

commit 3f03e30163c2117f5849a7fdc0f3b41b094eb8bd Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jul 14 23:37:06 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 26603: Remove obsolete http pipelining prefs --- 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 c3d83adf7d43..0981831a5c68 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -267,11 +267,6 @@ pref("javascript.options.asmjs", false); pref("gfx.font_rendering.graphite.enabled", false); // Network and performance -pref("network.http.pipelining", true); -pref("network.http.pipelining.aggressive", true); -pref("network.http.pipelining.maxrequests", 12); -pref("network.http.pipelining.ssl", true); -pref("network.http.proxy.pipelining", true); pref("security.ssl.enable_false_start", true); pref("network.http.connection-retry-timeout", 0); pref("network.http.max-persistent-connections-per-proxy", 256);

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26569_v2'
by gk＠torproject.org 19 Jul '18

19 Jul '18

commit fd7ecf819ad87e948de62b7328472a1857748bde Merge: ed17557 9756279 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 19 09:43:04 2018 +0000 Merge remote-tracking branch 'boklm/bug_26569_v2' projects/release/update_responses_config.yml | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor-browser-build/master] Bug 26569: redirect pre-8.0a9 alpha users to a separate update directory
by gk＠torproject.org 19 Jul '18

19 Jul '18

commit 9756279736cde0363abc97f5e0eced6ffb627d37 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 11 12:47:32 2018 +0200 Bug 26569: redirect pre-8.0a9 alpha users to a separate update directory --- projects/release/update_responses_config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 92c2203..3f7ff41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,3 +47,8 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 +htaccess_rewrite_rules: + alpha: | + # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory + RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last]

1 0

[tor-browser-build/master] Bug 26477: Make meek extension compatible with ESR 60
by gk＠torproject.org 18 Jul '18

18 Jul '18

commit ed1755732939ec95b14b501eb82c799b7756ef2a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 18 19:35:26 2018 +0000 Bug 26477: Make meek extension compatible with ESR 60 --- projects/meek/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/meek/config b/projects/meek/config index f58fbd1..7d0fd2d 100644 --- a/projects/meek/config +++ b/projects/meek/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.29 +version: 0.31 git_url: https://git.torproject.org/pluggable-transports/meek.git git_hash: '[% c("version") %]' tag_gpg_id: 1

1 0