[tbb-commits] [tor-browser-bundle/master] Bug 18899: meek profile gets all extensions

[gk at torproject.org]

commit 3b226118fadf42623032b423e41d6803e05901c1
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Apr 26 15:11:06 2016 -0400

    Bug 18899: meek profile gets all extensions
    
    Set extensions.installDistroAddons = false in the meek-http-helper
    browser profile so that Tor Launcher, Torbutton, etc. are not copied
    into that profile.
---
 Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js
index de2355c..820335d 100644
--- a/Bundle-Data/PTConfigs/meek-http-helper-user.js
+++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js
@@ -40,3 +40,7 @@ user_pref("network.proxy.socks_port", 9);
 user_pref("network.proxy.socks_remote_dns", true);
 
 user_pref("extensions.enabledAddons", "meek-http-helper at bamsoftware.com:1.0");
+
+// Ensure that distribution extensions (e.g., Tor Launcher) are not copied
+// into the meek-http-helper profile.
+user_pref("extensions.installDistroAddons", false);