commit 1648da8461dfed9975ac83fdb03aa745b6c8d49b Author: Kathy Brade brade@pearlcrescent.com Date: Tue Aug 30 15:48:03 2016 -0400

fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

Restore previous behavior: do not reset the SOCKS-related preferences when the TOR_SOCKS_HOST and TOR_SOCKS_PORT environment variables are not set. --- src/components/startup-observer.js | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index 467019e..f083482 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -73,16 +73,12 @@ StartupObserver.prototype = { this._prefs.setIntPref('network.proxy.type', 1); } this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT")); - } else { - this._prefs.setIntPref('network.proxy.socks_port', 9150); }

if (environ.exists("TOR_SOCKS_HOST")) { if (this.is_tbb) { this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); } - } else { - this._prefs.setCharPref('network.proxy.socks', '127.0.0.1'); }

if (environ.exists("TOR_TRANSPROXY")) {