commit 7406c8357ef42e8ec3fa19dc2bb20e0b9f8f3025 Author: Georg Koppen gk@torproject.org Date: Fri May 12 10:23:09 2017 +0000

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

We disable the Microsoft's Family Safety for MitM concerns, see bug 21686. --- 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 a948c45..73cb896 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -314,6 +314,9 @@ pref("security.tls.unrestricted_rc4_fallback", false); // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2);

+// Don't allow MitM via Microsoft Family Safety, see bug 21686 +pref("security.family_safety.mode", 0); + // Enforce SHA1 deprecation, see: bug 18042. pref("security.pki.sha1_enforcement_level", 2);