[tor-commits] [torbrowser/maint-2.4] Bugs #9283, #9195: Sync prefs with TBB-3.0.

[mikeperry@xxxxxxxxxxxxxx]

commit 0f7e062b5ccbc144ef854b3e1c3e797ac81eed31
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Thu Jul 25 16:49:46 2013 +0200

    Bugs #9283,#9195: Sync prefs with TBB-3.0.
    
    The most important change is that this disables download AV scanning (disabled
    due to "cloud" reporting features of AV software).
    
    Also includes some NoScript usability fixes.
---
 build-scripts/config/extension-overrides.js |    8 +++++---
 build-scripts/config/pound_tor.js           |   10 ++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build-scripts/config/extension-overrides.js b/build-scripts/config/extension-overrides.js
index 9d748ad..dff61f5 100644
--- a/build-scripts/config/extension-overrides.js
+++ b/build-scripts/config/extension-overrides.js
@@ -13,7 +13,6 @@ pref("extensions.torbutton.tz_string", "UTC+00:00");
 
 # HTTPS Everywhere Preferences:
 pref("extensions.https_everywhere._observatory.popup_shown", true);
-pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
 # NoScript Preferences:
 pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
@@ -38,9 +37,7 @@ pref("noscript.showAllowPage", false);
 pref("noscript.showBaseDomain", false);
 pref("noscript.showDistrust", false);
 pref("noscript.showRecentlyBlocked", false);
-pref("noscript.showRevokeTemp", false);
 pref("noscript.showTemp", false);
-pref("noscript.showTempAllowPage", false);
 pref("noscript.showTempToPerm", false);
 pref("noscript.showUntrusted", false);
 pref("noscript.STS.enabled", false);
@@ -53,3 +50,8 @@ pref("noscript.forbidFlash", false);
 pref("noscript.forbidSilverlight", false);
 pref("noscript.forbidJava", false);
 pref("noscript.forbidPlugins", false);
+// Usability tweaks
+pref("noscript.showPermanent", false);
+pref("noscript.showTempAllowPage", true);
+pref("noscript.showRevokeTemp", true);
+pref("noscript.notify", false);
diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js
index 8a82e4c..026caab 100644
--- a/build-scripts/config/pound_tor.js
+++ b/build-scripts/config/pound_tor.js
@@ -38,6 +38,7 @@ pref("geo.wifi.uri", "");
 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
 
 // Fingerprinting
 pref("webgl.min_capability_mode", true);
@@ -49,18 +50,16 @@ pref("browser.display.max_font_count",10);
 pref("gfx.downloadable_fonts.fallback_delay", -1);
 pref("general.appname.override", "Netscape");
 pref("general.appversion.override", "5.0 (Windows)");
-pref("general.buildID.override", "0");
-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.useragent.vendor", "");
 pref("general.useragent.vendorSub", "");
 pref("dom.enable_performance", false);
 pref("plugin.expose_full_path", false);
-pref("browser.startup.homepage_override.buildID", "20110325121920");
-pref("browser.startup.homepage_override.mstone", "rv:2.0");
 pref("browser.zoom.siteSpecific", false);
 // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton
 // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton
@@ -111,8 +110,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@xxxxxxx: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", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5");
 pref("extensions.enabledItems", "langpack-en-US@xxxxxxxxxxxxxxxxxxx:,{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);

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits