commit 810ba7e93981511765ec1be667689ae2992e8c49 Author: Alex Catarineu acat@torproject.org Date: Wed Sep 18 10:19:00 2019 +0200

Bug 31303: Do not launch tor in browser toolbox --- src/modules/tl-util.jsm | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index bac5eae..14ac76f 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -333,10 +333,13 @@ let TorLauncherUtil = // Public const kPrefStartTor = "extensions.torlauncher.start_tor"; try { + const kBrowserToolboxPort = "MOZ_BROWSER_TOOLBOX_PORT"; const kEnvSkipLaunch = "TOR_SKIP_LAUNCH";

var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); + if (env.exists(kBrowserToolboxPort)) + return false; if (env.exists(kEnvSkipLaunch)) return ("1" != env.get(kEnvSkipLaunch)); } catch(e) {}