[tor-commits] [torbrowser/maint-2.2] Bring remaining platform prefs into sync.

[erinn at torproject.org]

commit e61b72898be571c104513ee21ce3faaffd6836fb
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed Apr 25 16:06:20 2012 -0700

    Bring remaining platform prefs into sync.
    
    The two pref files are now identical.
---
 build-scripts/config/no-polipo-4.0.js |    4 ++--
 build-scripts/config/windows-4.0.js   |    6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js
index adf909d..7f445fa 100644
--- a/build-scripts/config/no-polipo-4.0.js
+++ b/build-scripts/config/no-polipo-4.0.js
@@ -66,8 +66,8 @@ user_pref("extensions.databaseSchema", 3);
 user_pref("extensions.enabledAddons", "https-everywhere at 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");
 user_pref("extensions.enabledItems", "langpack-en-US at 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");
 user_pref("extensions.enabledScopes", 1);
-user_pref("extensions.pendingOperations", false);
 user_pref("extensions.https_everywhere._observatory.popup_shown", true);
+user_pref("extensions.pendingOperations", false);
 user_pref("extensions.torbutton.fresh_install", false);
 user_pref("extensions.torbutton.locked_mode", true);
 user_pref("extensions.torbutton.proxies_applied", true);
@@ -82,7 +82,6 @@ user_pref("extensions.torbutton.tor_enabled", true);
 user_pref("extensions.torbutton.tor_memory_jar", true);
 user_pref("extensions.torbutton.tz_string", "UTC+00:00");
 user_pref("extensions.update.enabled", true);
-user_pref("extensions.update.notifyUser", false);
 user_pref("general.appname.override", "Netscape");
 user_pref("general.appversion.override", "5.0 (Windows; en-US)");
 user_pref("general.buildID.override", "0");
@@ -166,3 +165,4 @@ user_pref("urlclassifier.tableversion.goog-white-domain", "1.481");
 user_pref("urlclassifier.tableversion.goog-white-url", "1.371");
 user_pref("xpinstall.whitelist.add", "");
 user_pref("xpinstall.whitelist.add.36", "");
+user_pref("security.ssl.enable_false_start", true);
diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js
index dfe93ce..7f445fa 100644
--- a/build-scripts/config/windows-4.0.js
+++ b/build-scripts/config/windows-4.0.js
@@ -45,7 +45,6 @@ user_pref("browser.safebrowsing.malware.enabled", false);
 user_pref("browser.search.suggest.enabled", false);
 user_pref("browser.search.update", false);
 user_pref("browser.sessionstore.privacy_level", 2);
-user_pref("browser.sessionstore.resume_session_once", true);
 user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1");
 user_pref("browser.startup.homepage_override.buildID", "20110325121920");
@@ -71,21 +70,18 @@ user_pref("extensions.https_everywhere._observatory.popup_shown", true);
 user_pref("extensions.pendingOperations", false);
 user_pref("extensions.torbutton.fresh_install", false);
 user_pref("extensions.torbutton.locked_mode", true);
-user_pref("extensions.torbutton.normal_exit", true);
+user_pref("extensions.torbutton.proxies_applied", true);
 user_pref("extensions.torbutton.restore_tor", true);
 user_pref("extensions.torbutton.saved.auto_update", false);
 user_pref("extensions.torbutton.saved.share_proxy_settings", false);
 user_pref("extensions.torbutton.saved.socks_version", 5);
-user_pref("extensions.torbutton.saved.type", 1);
 user_pref("extensions.torbutton.settings_applied", true);
 user_pref("extensions.torbutton.socks_host", "127.0.0.1");
 user_pref("extensions.torbutton.socks_port", 9050);
-user_pref("extensions.torbutton.startup", true);
 user_pref("extensions.torbutton.tor_enabled", true);
 user_pref("extensions.torbutton.tor_memory_jar", true);
 user_pref("extensions.torbutton.tz_string", "UTC+00:00");
 user_pref("extensions.update.enabled", true);
-user_pref("extensions.update.notifyUser", true);
 user_pref("general.appname.override", "Netscape");
 user_pref("general.appversion.override", "5.0 (Windows; en-US)");
 user_pref("general.buildID.override", "0");