[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [torbrowser/maint-2.3] Combine no-polipo-4.0.js and windows-4.0.js into prefs.js

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbrowser/maint-2.3] Combine no-polipo-4.0.js and windows-4.0.js into prefs.js
From: erinn@xxxxxxxxxxxxxx
Date: Thu, 26 Apr 2012 11:37:34 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 26 Apr 2012 07:39:13 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: code repository commits <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx
commit c518a3eae125dab2b1c38c85733d33ed9998df79
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Thu Apr 26 12:48:20 2012 +0200

    Combine no-polipo-4.0.js and windows-4.0.js into prefs.js
---
 build-scripts/config/no-polipo-4.0.js |  178 ---------------------------------
 build-scripts/config/prefs.js         |  178 +++++++++++++++++++++++++++++++++
 build-scripts/config/windows-4.0.js   |  178 ---------------------------------
 build-scripts/linux.mk                |    6 +-
 build-scripts/osx.mk                  |    4 +-
 build-scripts/windows.mk              |    5 +-
 6 files changed, 186 insertions(+), 363 deletions(-)

diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js
deleted file mode 100644
index 593db73..0000000
--- a/build-scripts/config/no-polipo-4.0.js
+++ /dev/null
@@ -1,178 +0,0 @@
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the application is running,
- * the changes will be overwritten when the application exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-user_pref("app.update.auto", false);
-user_pref("app.update.enabled", false);
-user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
-user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
-user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
-user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822);
-user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
-user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
-user_pref("browser.cache.disk.capacity", 0);
-user_pref("browser.cache.disk.enable", false);
-user_pref("browser.cache.disk.smart_size.enabled", false);
-user_pref("browser.cache.disk.smart_size.first_run", false);
-user_pref("browser.cache.offline.enable", false);
-user_pref("browser.chrome.favicons", false);
-user_pref("browser.chrome.image_icons.max_size", 0);
-user_pref("browser.chrome.site_icons", false);
-user_pref("browser.download.manager.retention", 1);
-user_pref("browser.download.useDownloadDir", false);
-user_pref("browser.formfill.enable", false);
-user_pref("browser.history_expire_days.mirror", 0);
-user_pref("browser.microsummary.updateGenerators", false);
-user_pref("browser.migration.version", 5);
-user_pref("browser.places.importBookmarksHTML", false);
-user_pref("browser.places.importDefaults", false);
-user_pref("browser.places.leftPaneFolderId", -1);
-user_pref("browser.places.migratePostDataAnnotations", false);
-user_pref("browser.places.smartBookmarksVersion", 2);
-user_pref("browser.places.updateRecentTagsUri", false);
-user_pref("browser.preferences.advanced.selectedTabIndex", 0);
-user_pref("browser.privatebrowsing.autostart", false);
-user_pref("browser.rights.3.shown", true);
-user_pref("browser.safebrowsing.enabled", false);
-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.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");
-user_pref("browser.startup.homepage_override.mstone", "rv:2.0");
-user_pref("browser.urlbar.autocomplete.enabled", true);
-user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:");
-user_pref("dom.event.contextmenu.enabled", false);
-user_pref("dom.storage.enabled", false);
-user_pref("extensions.autoDisableScopes", 0);
-user_pref("extensions.bootstrappedAddons", "{}");
-user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia");
-user_pref("extensions.bprivacy.donotaskforfolder", true);
-user_pref("extensions.bprivacy.donotaskonexit", true);
-user_pref("extensions.bprivacy.initiated", true);
-user_pref("extensions.checkCompatibility.4.*", false);
-user_pref("extensions.checkUpdateSecurity", true);
-user_pref("extensions.databaseSchema", 3);
-user_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");
-user_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");
-user_pref("extensions.enabledScopes", 1);
-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);
-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.settings_applied", true);
-user_pref("extensions.torbutton.socks_host", "127.0.0.1");
-user_pref("extensions.torbutton.socks_port", 9050);
-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("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.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", "");
-user_pref("geo.enabled", false);
-user_pref("geo.wifi.uri", "");
-user_pref("intl.accept_languages", "en-us, en");
-user_pref("intl.charsetmenu.browser.cache", "UTF-8");
-user_pref("network.cookie.cookieBehavior", 1);
-user_pref("network.cookie.lifetimePolicy", 2);
-user_pref("network.cookie.prefsMigrated", true);
-user_pref("network.http.pipelining", true);
-user_pref("network.http.pipelining.maxrequests", 8);
-user_pref("network.http.pipelining.ssl", true);
-user_pref("network.http.proxy.pipelining", true);
-user_pref("network.hosts.pop_server", "");
-user_pref("network.protocol-handler.external-default", false);
-user_pref("network.protocol-handler.external.mailto", false);
-user_pref("network.protocol-handler.external.news", false);
-user_pref("network.protocol-handler.external.nntp", false);
-user_pref("network.protocol-handler.external.snews", false);
-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.socks", "127.0.0.1");
-user_pref("network.proxy.socks_port", 9050);
-user_pref("network.proxy.socks_remote_dns", true);
-user_pref("network.proxy.type", 1);
-user_pref("network.security.ports.banned", "8118,8123,9050,9051");
-user_pref("noscript.ABE.enabled", false);
-user_pref("noscript.ABE.notify", false);
-user_pref("noscript.ABE.wanIpAsLocal", false);
-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.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);
-user_pref("noscript.showAllowPage", false);
-user_pref("noscript.showBaseDomain", false);
-user_pref("noscript.showDistrust", false);
-user_pref("noscript.showRecentlyBlocked", false);
-user_pref("noscript.showRevokeTemp", false);
-user_pref("noscript.showTemp", false);
-user_pref("noscript.showTempAllowPage", false);
-user_pref("noscript.showTempToPerm", false);
-user_pref("noscript.showUntrusted", false);
-user_pref("noscript.STS.enabled", false);
-user_pref("noscript.subscription.lastCheck", -142148139);
-user_pref("noscript.temp", "");
-user_pref("noscript.untrusted", "");
-user_pref("places.history.enabled", false);
-user_pref("places.history.expiration.transient_current_max_pages", 120795);
-user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
-user_pref("plugin.expose_full_path", true);
-user_pref("plugin.scan.4xPluginFolder", false);
-user_pref("plugin.scan.Acrobat", "99.0");
-user_pref("plugin.scan.Quicktime", "99.0");
-user_pref("plugin.scan.SunJRE", "99.0");
-user_pref("plugin.scan.WindowsMediaPlayer", "99.0");
-user_pref("plugin.scan.plid.all", false);
-user_pref("privacy.sanitize.migrateFx3Prefs", true);
-user_pref("security.enable_java", false);
-user_pref("signon.rememberSignons", false);
-user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey";, 1235166825);
-user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
-user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
-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);
-user_pref("dom.battery.enabled", false); // fingerpriting due to differing OS implementations
-user_pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations
-user_pref("browser.display.max_font_attempts",10);
-user_pref("browser.display.max_font_count",5);
-user_pref("browser.sessionstore.resume_from_crash",false);
-user_pref("browser.search.order.1", "Startpage");
-user_pref("browser.search.order.2", "DuckDuckGo");
-user_pref("browser.search.order.3", "Google");
-user_pref("browser.search.selectedEngine", "Startpage"); // bam
-user_pref("dom.indexedDB.enabled", false);
diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js
new file mode 100644
index 0000000..593db73
--- /dev/null
+++ b/build-scripts/config/prefs.js
@@ -0,0 +1,178 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the application is running,
+ * the changes will be overwritten when the application exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+
+user_pref("app.update.auto", false);
+user_pref("app.update.enabled", false);
+user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
+user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822);
+user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
+user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
+user_pref("browser.cache.disk.capacity", 0);
+user_pref("browser.cache.disk.enable", false);
+user_pref("browser.cache.disk.smart_size.enabled", false);
+user_pref("browser.cache.disk.smart_size.first_run", false);
+user_pref("browser.cache.offline.enable", false);
+user_pref("browser.chrome.favicons", false);
+user_pref("browser.chrome.image_icons.max_size", 0);
+user_pref("browser.chrome.site_icons", false);
+user_pref("browser.download.manager.retention", 1);
+user_pref("browser.download.useDownloadDir", false);
+user_pref("browser.formfill.enable", false);
+user_pref("browser.history_expire_days.mirror", 0);
+user_pref("browser.microsummary.updateGenerators", false);
+user_pref("browser.migration.version", 5);
+user_pref("browser.places.importBookmarksHTML", false);
+user_pref("browser.places.importDefaults", false);
+user_pref("browser.places.leftPaneFolderId", -1);
+user_pref("browser.places.migratePostDataAnnotations", false);
+user_pref("browser.places.smartBookmarksVersion", 2);
+user_pref("browser.places.updateRecentTagsUri", false);
+user_pref("browser.preferences.advanced.selectedTabIndex", 0);
+user_pref("browser.privatebrowsing.autostart", false);
+user_pref("browser.rights.3.shown", true);
+user_pref("browser.safebrowsing.enabled", false);
+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.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");
+user_pref("browser.startup.homepage_override.mstone", "rv:2.0");
+user_pref("browser.urlbar.autocomplete.enabled", true);
+user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
+user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:");
+user_pref("dom.event.contextmenu.enabled", false);
+user_pref("dom.storage.enabled", false);
+user_pref("extensions.autoDisableScopes", 0);
+user_pref("extensions.bootstrappedAddons", "{}");
+user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia");
+user_pref("extensions.bprivacy.donotaskforfolder", true);
+user_pref("extensions.bprivacy.donotaskonexit", true);
+user_pref("extensions.bprivacy.initiated", true);
+user_pref("extensions.checkCompatibility.4.*", false);
+user_pref("extensions.checkUpdateSecurity", true);
+user_pref("extensions.databaseSchema", 3);
+user_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");
+user_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");
+user_pref("extensions.enabledScopes", 1);
+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);
+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.settings_applied", true);
+user_pref("extensions.torbutton.socks_host", "127.0.0.1");
+user_pref("extensions.torbutton.socks_port", 9050);
+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("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.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", "");
+user_pref("geo.enabled", false);
+user_pref("geo.wifi.uri", "");
+user_pref("intl.accept_languages", "en-us, en");
+user_pref("intl.charsetmenu.browser.cache", "UTF-8");
+user_pref("network.cookie.cookieBehavior", 1);
+user_pref("network.cookie.lifetimePolicy", 2);
+user_pref("network.cookie.prefsMigrated", true);
+user_pref("network.http.pipelining", true);
+user_pref("network.http.pipelining.maxrequests", 8);
+user_pref("network.http.pipelining.ssl", true);
+user_pref("network.http.proxy.pipelining", true);
+user_pref("network.hosts.pop_server", "");
+user_pref("network.protocol-handler.external-default", false);
+user_pref("network.protocol-handler.external.mailto", false);
+user_pref("network.protocol-handler.external.news", false);
+user_pref("network.protocol-handler.external.nntp", false);
+user_pref("network.protocol-handler.external.snews", false);
+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.socks", "127.0.0.1");
+user_pref("network.proxy.socks_port", 9050);
+user_pref("network.proxy.socks_remote_dns", true);
+user_pref("network.proxy.type", 1);
+user_pref("network.security.ports.banned", "8118,8123,9050,9051");
+user_pref("noscript.ABE.enabled", false);
+user_pref("noscript.ABE.notify", false);
+user_pref("noscript.ABE.wanIpAsLocal", false);
+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.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);
+user_pref("noscript.showAllowPage", false);
+user_pref("noscript.showBaseDomain", false);
+user_pref("noscript.showDistrust", false);
+user_pref("noscript.showRecentlyBlocked", false);
+user_pref("noscript.showRevokeTemp", false);
+user_pref("noscript.showTemp", false);
+user_pref("noscript.showTempAllowPage", false);
+user_pref("noscript.showTempToPerm", false);
+user_pref("noscript.showUntrusted", false);
+user_pref("noscript.STS.enabled", false);
+user_pref("noscript.subscription.lastCheck", -142148139);
+user_pref("noscript.temp", "");
+user_pref("noscript.untrusted", "");
+user_pref("places.history.enabled", false);
+user_pref("places.history.expiration.transient_current_max_pages", 120795);
+user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
+user_pref("plugin.expose_full_path", true);
+user_pref("plugin.scan.4xPluginFolder", false);
+user_pref("plugin.scan.Acrobat", "99.0");
+user_pref("plugin.scan.Quicktime", "99.0");
+user_pref("plugin.scan.SunJRE", "99.0");
+user_pref("plugin.scan.WindowsMediaPlayer", "99.0");
+user_pref("plugin.scan.plid.all", false);
+user_pref("privacy.sanitize.migrateFx3Prefs", true);
+user_pref("security.enable_java", false);
+user_pref("signon.rememberSignons", false);
+user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey";, 1235166825);
+user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
+user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
+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);
+user_pref("dom.battery.enabled", false); // fingerpriting due to differing OS implementations
+user_pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations
+user_pref("browser.display.max_font_attempts",10);
+user_pref("browser.display.max_font_count",5);
+user_pref("browser.sessionstore.resume_from_crash",false);
+user_pref("browser.search.order.1", "Startpage");
+user_pref("browser.search.order.2", "DuckDuckGo");
+user_pref("browser.search.order.3", "Google");
+user_pref("browser.search.selectedEngine", "Startpage"); // bam
+user_pref("dom.indexedDB.enabled", false);
diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js
deleted file mode 100644
index 593db73..0000000
--- a/build-scripts/config/windows-4.0.js
+++ /dev/null
@@ -1,178 +0,0 @@
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the application is running,
- * the changes will be overwritten when the application exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-user_pref("app.update.auto", false);
-user_pref("app.update.enabled", false);
-user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
-user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
-user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
-user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822);
-user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
-user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
-user_pref("browser.cache.disk.capacity", 0);
-user_pref("browser.cache.disk.enable", false);
-user_pref("browser.cache.disk.smart_size.enabled", false);
-user_pref("browser.cache.disk.smart_size.first_run", false);
-user_pref("browser.cache.offline.enable", false);
-user_pref("browser.chrome.favicons", false);
-user_pref("browser.chrome.image_icons.max_size", 0);
-user_pref("browser.chrome.site_icons", false);
-user_pref("browser.download.manager.retention", 1);
-user_pref("browser.download.useDownloadDir", false);
-user_pref("browser.formfill.enable", false);
-user_pref("browser.history_expire_days.mirror", 0);
-user_pref("browser.microsummary.updateGenerators", false);
-user_pref("browser.migration.version", 5);
-user_pref("browser.places.importBookmarksHTML", false);
-user_pref("browser.places.importDefaults", false);
-user_pref("browser.places.leftPaneFolderId", -1);
-user_pref("browser.places.migratePostDataAnnotations", false);
-user_pref("browser.places.smartBookmarksVersion", 2);
-user_pref("browser.places.updateRecentTagsUri", false);
-user_pref("browser.preferences.advanced.selectedTabIndex", 0);
-user_pref("browser.privatebrowsing.autostart", false);
-user_pref("browser.rights.3.shown", true);
-user_pref("browser.safebrowsing.enabled", false);
-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.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");
-user_pref("browser.startup.homepage_override.mstone", "rv:2.0");
-user_pref("browser.urlbar.autocomplete.enabled", true);
-user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:");
-user_pref("dom.event.contextmenu.enabled", false);
-user_pref("dom.storage.enabled", false);
-user_pref("extensions.autoDisableScopes", 0);
-user_pref("extensions.bootstrappedAddons", "{}");
-user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia");
-user_pref("extensions.bprivacy.donotaskforfolder", true);
-user_pref("extensions.bprivacy.donotaskonexit", true);
-user_pref("extensions.bprivacy.initiated", true);
-user_pref("extensions.checkCompatibility.4.*", false);
-user_pref("extensions.checkUpdateSecurity", true);
-user_pref("extensions.databaseSchema", 3);
-user_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");
-user_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");
-user_pref("extensions.enabledScopes", 1);
-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);
-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.settings_applied", true);
-user_pref("extensions.torbutton.socks_host", "127.0.0.1");
-user_pref("extensions.torbutton.socks_port", 9050);
-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("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.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", "");
-user_pref("geo.enabled", false);
-user_pref("geo.wifi.uri", "");
-user_pref("intl.accept_languages", "en-us, en");
-user_pref("intl.charsetmenu.browser.cache", "UTF-8");
-user_pref("network.cookie.cookieBehavior", 1);
-user_pref("network.cookie.lifetimePolicy", 2);
-user_pref("network.cookie.prefsMigrated", true);
-user_pref("network.http.pipelining", true);
-user_pref("network.http.pipelining.maxrequests", 8);
-user_pref("network.http.pipelining.ssl", true);
-user_pref("network.http.proxy.pipelining", true);
-user_pref("network.hosts.pop_server", "");
-user_pref("network.protocol-handler.external-default", false);
-user_pref("network.protocol-handler.external.mailto", false);
-user_pref("network.protocol-handler.external.news", false);
-user_pref("network.protocol-handler.external.nntp", false);
-user_pref("network.protocol-handler.external.snews", false);
-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.socks", "127.0.0.1");
-user_pref("network.proxy.socks_port", 9050);
-user_pref("network.proxy.socks_remote_dns", true);
-user_pref("network.proxy.type", 1);
-user_pref("network.security.ports.banned", "8118,8123,9050,9051");
-user_pref("noscript.ABE.enabled", false);
-user_pref("noscript.ABE.notify", false);
-user_pref("noscript.ABE.wanIpAsLocal", false);
-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.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);
-user_pref("noscript.showAllowPage", false);
-user_pref("noscript.showBaseDomain", false);
-user_pref("noscript.showDistrust", false);
-user_pref("noscript.showRecentlyBlocked", false);
-user_pref("noscript.showRevokeTemp", false);
-user_pref("noscript.showTemp", false);
-user_pref("noscript.showTempAllowPage", false);
-user_pref("noscript.showTempToPerm", false);
-user_pref("noscript.showUntrusted", false);
-user_pref("noscript.STS.enabled", false);
-user_pref("noscript.subscription.lastCheck", -142148139);
-user_pref("noscript.temp", "");
-user_pref("noscript.untrusted", "");
-user_pref("places.history.enabled", false);
-user_pref("places.history.expiration.transient_current_max_pages", 120795);
-user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
-user_pref("plugin.expose_full_path", true);
-user_pref("plugin.scan.4xPluginFolder", false);
-user_pref("plugin.scan.Acrobat", "99.0");
-user_pref("plugin.scan.Quicktime", "99.0");
-user_pref("plugin.scan.SunJRE", "99.0");
-user_pref("plugin.scan.WindowsMediaPlayer", "99.0");
-user_pref("plugin.scan.plid.all", false);
-user_pref("privacy.sanitize.migrateFx3Prefs", true);
-user_pref("security.enable_java", false);
-user_pref("signon.rememberSignons", false);
-user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey";, 1235166825);
-user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
-user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
-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);
-user_pref("dom.battery.enabled", false); // fingerpriting due to differing OS implementations
-user_pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations
-user_pref("browser.display.max_font_attempts",10);
-user_pref("browser.display.max_font_count",5);
-user_pref("browser.sessionstore.resume_from_crash",false);
-user_pref("browser.search.order.1", "Startpage");
-user_pref("browser.search.order.2", "DuckDuckGo");
-user_pref("browser.search.order.3", "Google");
-user_pref("browser.search.selectedEngine", "Startpage"); // bam
-user_pref("dom.indexedDB.enabled", false);
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 67f7e75..fa776de 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -299,7 +299,7 @@ configure-apps:
 	mkdir -p $(DEST)/Data/profile/extensions
 	cp -R config/firefox-profiles.ini $(DEST)/Data/profiles.ini
 	cp config/bookmarks.html $(DEST)/Data/profile
-	cp config/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js
+	cp config/prefs.js $(DEST)/Data/profile/prefs.js
 	## Configure Pidgin
 ifeq ($(USE_PIDGIN),1)
 	mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
@@ -399,9 +399,9 @@ patch-firefox-language:
 	## Don't use {} because they aren't always interpreted correctly. Thanks, sh. 
 	mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/
 	cp config/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/
-	cp config/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
+	cp config/prefs.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
 	cp config/bookmarks.html $(BUNDLE)/Data/profile
-	cp config/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js
+	cp config/prefs.js $(BUNDLE)/Data/profile/prefs.js
 	./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e
 	./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e
 
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 59b068c..dc46d8a 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -281,7 +281,7 @@ configure-apps:
 	#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
 	cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini
 	cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
-	cp config/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+	cp config/prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
 	cp config/Info.plist $(DEST)/Contents
 	cp config/PkgInfo $(DEST)/Contents
 	cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources
@@ -385,7 +385,7 @@ endif
 patch-firefox-language:
 	## Patch the default Firefox prefs.js
 	## Don't use {} because they aren't always interpreted correctly. Thanks, sh. 
-	cp config/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
+	cp config/prefs.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
 	cp config/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile
 	./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e
 
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 759628d..3a1acd4 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -286,9 +286,10 @@ endif
 configure-apps:
 
 	mkdir -p $(DEST)/FirefoxPortable/Data/profile
+	mkdir -p $(DEST)/FirefoxPortable/App/DefaultData/profile
 	## Configure Firefox preferences
-	cp config/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js
-	cp config/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js
+	cp config/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js
+	cp config/prefs.js $(DEST)/FirefoxPortable/Data/profile/prefs.js
 	cp config/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/
 
 	## Set up alternate launcher



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] [torbrowser/maint-2.3] Add 3 patches.
Next by Author: [tor-commits] [torbrowser/master] Bring remaining platform prefs into sync.
Previous by thread: [tor-commits] [torbrowser/maint-2.3] Add 3 patches.
Next by thread: [tor-commits] [torbrowser/master] Bring remaining platform prefs into sync.
Index(es):
- Author
- Thread