[tor-commits] [torbrowser/maint-2.2] Make windows-4.0.js more like no-polipo-4.0.js

[erinn at torproject.org]

commit 16d8869d1a8a6585037d669cd997b5c755b0d84c
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Feb 1 22:25:16 2012 +0100

    Make windows-4.0.js more like no-polipo-4.0.js
---
 build-scripts/config/windows-4.0.js |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js
index c06f9e9..da7a878 100644
--- a/build-scripts/config/windows-4.0.js
+++ b/build-scripts/config/windows-4.0.js
@@ -69,13 +69,8 @@ user_pref("extensions.enabledItems", "langpack-en-US at firefox.mozilla.org:,{73a6f
 user_pref("extensions.enabledScopes", 1);
 user_pref("extensions.pendingOperations", false);
 user_pref("extensions.torbutton.fresh_install", false);
-user_pref("extensions.torbutton.http_port", 8118);
-user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.https_port", 8118);
-user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
 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);
@@ -93,10 +88,10 @@ 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");
+user_pref("general.useragent.locale", "SHPONKA");
 user_pref("general.oscpu.override", "Windows NT 6.1");
 user_pref("general.platform.override", "Win32");
 user_pref("general.productSub.override", "20100401");
-user_pref("general.useragent.locale", "SHPONKA");
 user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3");
 user_pref("general.useragent.vendor", "");
 user_pref("general.useragent.vendorSub", "");
@@ -121,14 +116,9 @@ user_pref("network.protocol-handler.warn-external.mailto", true);
 user_pref("network.protocol-handler.warn-external.news", true);
 user_pref("network.protocol-handler.warn-external.nntp", true);
 user_pref("network.protocol-handler.warn-external.snews", true);
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 8118);
-user_pref("network.proxy.no_proxies_on", "127.0.0.1");
 user_pref("network.proxy.socks", "127.0.0.1");
 user_pref("network.proxy.socks_port", 9050);
 user_pref("network.proxy.socks_remote_dns", true);
-user_pref("network.proxy.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 8118);
 user_pref("network.proxy.type", 1);
 user_pref("network.security.ports.banned", "8118,8123,9050,9051");
 user_pref("noscript.ABE.enabled", false);
@@ -138,10 +128,10 @@ user_pref("noscript.autoReload", false);
 user_pref("noscript.contentBlocker", true);
 user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com");
 user_pref("noscript.firstRunRedirection", false);
-user_pref("noscript.forbidWebGL", true);
 user_pref("noscript.global", true);
 user_pref("noscript.gtemp", "");
 user_pref("noscript.opacizeObject", 3);
+user_pref("noscript.forbidWebGL", true);
 user_pref("noscript.options.tabSelectedIndexes", "5,0,0");
 user_pref("noscript.policynames", "");
 user_pref("noscript.secureCookies", true);