[tbb-commits] [tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.

[gk at torproject.org]

commit c1a5e1abf6ee05b0b1d3b1462b3c9e1c180b153e
Author: Georg Koppen <gk at torproject.org>
Date:   Mon May 29 09:10:13 2017 +0000

    fixup! TB4: Tor Browser's Firefox preference overrides.
    
    Fixes bug 21323. We are using Mixed Content Blocking now in Tor Browser
    as the advantages of doing so seem to outweigh the downsides.
---
 browser/app/profile/000-tor-browser.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 78e6a05..d2fb5e5 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -100,7 +100,6 @@ pref("experiments.enabled", false);
 // Disable the UITour backend so there is no chance that a remote page
 // can use it to confuse Tor Browser users.
 pref("browser.uitour.enabled", false);
-pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched
 pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync
 pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers
 pref("services.sync.engine.addons", false);