commit 502fe9064244210138e634bdb44b1a1712092d21 Author: Kathy Brade brade@pearlcrescent.com Date: Wed Aug 5 15:07:30 2020 -0400

fixup! TB4: Tor Browser's Firefox preference overrides.

Fixes #40066. --- browser/app/profile/000-tor-browser.js | 10 +--------- mobile/android/app/000-tor-browser-android.js | 10 ---------- 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e86252ccd98c..3be6e460b628 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -33,10 +33,6 @@ pref("app.releaseNotesURL", "about:blank"); pref("app.update.staging.enabled", false); #endif

-// No need to contact the Kinto-based blocklist system in addition to the old -// one which is still used, see bug 22071. -pref("services.blocklist.update_enabled", false); - // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true); @@ -73,7 +69,7 @@ pref("browser.ssb.enabled", false); // Misc privacy: Remote pref("browser.send_pings", false); pref("geo.enabled", false); -pref("geo.wifi.uri", ""); +pref("geo.provider.network.url", ""); pref("browser.search.suggest.enabled", false); pref("browser.safebrowsing.malware.enabled", false); pref("browser.safebrowsing.phishing.enabled", false); @@ -94,9 +90,6 @@ pref("datareporting.policy.dataSubmissionEnabled", false); pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. -// No experiments, use Tor Browser. See 21797. -pref("experiments.enabled", false); -pref("browser.syncPromoViewsLeftMap", "{"addons":0, "passwords":0, "bookmarks":0}"); // Don't promote sync pref("identity.fxaccounts.enabled", false); // Disable sync by default pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers pref("services.sync.engine.addons", false); @@ -133,7 +126,6 @@ pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now -pref("browser.cache.frecency_experiment", -1); // Disable intermediate preloading (Bug 30682) pref("security.remote_settings.intermediates.enabled", false); // Bug 2874: Block Components.interfaces from content diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index db9e23063738..23fd39beac77 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -24,19 +24,9 @@ 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); - // 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", ""); - // Enable touch events on Android (highlighting text, etc) pref("dom.w3c_touch_events.enabled", 2);