[tor-commits] [torbrowser/maint-2.4] Sync prefs with TBB3.0beta1.

[mikeperry at torproject.org]

commit 67d8c2525d3e46a3bb921f15a100ce4782a521c3
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Oct 29 18:58:09 2013 -0700

    Sync prefs with TBB3.0beta1.
---
 build-scripts/config/pound_tor.js |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js
index 585fdd5..4ff399c 100644
--- a/build-scripts/config/pound_tor.js
+++ b/build-scripts/config/pound_tor.js
@@ -39,6 +39,7 @@ pref("browser.search.suggest.enabled", false);
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
 pref("browser.download.manager.scanWhenDone", false); // prevents AV remote reporting of downloads
+pref("extensions.ui.lastCategory", "addons://list/extension");
 
 // Fingerprinting
 pref("webgl.min_capability_mode", true);
@@ -53,10 +54,10 @@ pref("general.appversion.override", "5.0 (Windows)");
 pref("general.useragent.locale", "SHPONKA");
 pref("general.oscpu.override", "Windows NT 6.1");
 pref("general.platform.override", "Win32");
-pref("general.productSub.override", "20100101");
 pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0");
-pref("general.buildID.override", "20130618114625");
-pref("browser.startup.homepage_override.buildID", "20130618114625");
+pref("general.productSub.override", "20100101");
+pref("general.buildID.override", "20100101");
+pref("browser.startup.homepage_override.buildID", "20100101");
 pref("general.useragent.vendor", "");
 pref("general.useragent.vendorSub", "");
 pref("dom.enable_performance", false);
@@ -78,7 +79,7 @@ pref("network.proxy.socks", "127.0.0.1");
 pref("network.proxy.socks_port", 9150);
 pref("network.proxy.socks_remote_dns", true);
 pref("network.proxy.type", 1);
-pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151");
+pref("network.security.ports.banned", "9050,9051,9150,9151");
 pref("network.dns.disablePrefetch", true);
 pref("network.protocol-handler.external-default", false);
 pref("network.protocol-handler.external.mailto", false);
@@ -90,6 +91,8 @@ pref("network.protocol-handler.warn-external.news", true);
 pref("network.protocol-handler.warn-external.nntp", true);
 pref("network.protocol-handler.warn-external.snews", true);
 pref("plugins.click_to_play", true);
+pref("plugin.state.flash", 1);
+pref("plugins.hide_infobar_for_missing_plugin", true);
 
 // Network and performance
 pref("network.http.pipelining", true);
@@ -120,3 +123,9 @@ pref("xpinstall.whitelist.add.36", "");
 
 // Omnibox settings
 pref("keyword.URL", "https://startpage.com/do/search?q=");
+
+// Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW?
+// If only the first one is set to true then the Tor Network Settings are blank
+// on some Windows machines.
+pref("gfx.direct2d.disabled", true);
+pref("layers.acceleration.disabled", true);