commit c2e1da797fb05ffc5ba711b694545ea269dd0ffa Author: Mike Perry mikeperry-git@torproject.org Date: Tue May 7 15:00:30 2013 -0700

squash! Tor Browser's Firefox preference overrides. --- browser/app/profile/tor-browser.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js index a6c2a1b..cd2096a 100644 --- a/browser/app/profile/tor-browser.js +++ b/browser/app/profile/tor-browser.js @@ -111,8 +111,7 @@ pref("extensions.autoDisableScopes", 0); pref("extensions.bootstrappedAddons", "{}"); pref("extensions.checkCompatibility.4.*", false); pref("extensions.databaseSchema", 3); -// XXX: Enable new Torbutton/disable old?? -pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); +pref("extensions.enabledAddons", "tor-launcher%40torproject.org:0.0.1,torbutton%40torproject.org:1.5.2,https-everywhere%40eff.org:3.2,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1"); pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); pref("extensions.enabledScopes", 1); pref("extensions.pendingOperations", false);