commit 6e730d5184f8d74860488f8fa998bd1e0023281f Author: Georg Koppen gk@torproject.org Date: Mon Apr 1 13:56:22 2019 +0000

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

Bug 29916: Make sure enterprise policies are disabled --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 08d00866ef04..cca469725d28 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -225,6 +225,9 @@ pref("network.file.disable_unc_paths", true); // Enhance our treatment of file:// to avoid proxy bypasses (see Mozilla's bug // 1412081) pref("network.file.path_blacklist", "/net"); +// Make sure no enterprise policy can interfere with our proxy settings, see +// #29916. +pref("browser.policies.testing.disallowEnterprise", true);

// Security slider pref("svg.in-content.enabled", true);