commit 38e1a1966adbbcb5a15edbf300f33f5de8d7aae6 Author: Georg Koppen gk@torproject.org Date: Fri May 12 15:11:46 2017 +0000

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

The old blocklist update system is still running. Thus, no need to contact the new, on Kinto based system in addition. Fixes bug 22071. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 73cb896..9483702 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -29,6 +29,10 @@ pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they m 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);