[tor-commits] [tor-browser-bundle/hardened-builds] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

[gk@xxxxxxxxxxxxxx]

commit 36842fddafcf79bab6911def2ec4133826bc28f9
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   Mon Sep 19 12:02:21 2016 -0400

    Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
    
    Remove from extension-overrides.js the Torbutton preferences that are
    no longer used.
---
 .../Browser/profile.default/preferences/extension-overrides.js   | 9 ---------
 .../Browser/profile.default/preferences/extension-overrides.js   | 9 ---------
 .../Browser/profile.default/preferences/extension-overrides.js   | 9 ---------
 3 files changed, 27 deletions(-)

diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
index 865398e..3ccab99 100644
--- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-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);
diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
index 865398e..3ccab99 100644
--- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-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);
diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
index 865398e..3ccab99 100644
--- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-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);

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