commit 70b7aa5c1ccaac72c063b135d53e413fc64ca6c1 Author: Alex Catarineu acat@torproject.org Date: Wed Oct 16 11:29:24 2019 +0200

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

Fixes #30681. --- 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 78b252846689..4c244b49d181 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -322,6 +322,9 @@ pref("security.cert_pinning.enforcement_level", 2); // Don't allow MitM via Microsoft Family Safety, see bug 21686 pref("security.family_safety.mode", 0);

+// Don't allow MitM via enterprise roots, see bug 30681 +pref("security.enterprise_roots.enabled", false); + // Enforce SHA1 deprecation, see: bug 18042. pref("security.pki.sha1_enforcement_level", 2);