commit f0c8c02eef769712ede848238e57aa55b20fe3a8 Author: Mike Perry mikeperry-git@torproject.org Date: Tue May 7 17:28:34 2013 -0700

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

diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js index cd2096a..bf0c81b 100644 --- a/browser/app/profile/tor-browser.js +++ b/browser/app/profile/tor-browser.js @@ -111,7 +111,7 @@ pref("extensions.autoDisableScopes", 0); pref("extensions.bootstrappedAddons", "{}"); pref("extensions.checkCompatibility.4.*", false); pref("extensions.databaseSchema", 3); -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.enabledAddons", "torlauncher%40torproject.org:0.1.1pre-alpha,https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2" 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);