commit 0082643cd0b88f34cb56501b6631307616b8cc1d Author: Kathy Brade brade@pearlcrescent.com Date: Wed Nov 2 11:41:12 2016 -0400
Bug 19646: Mac OS: wrong location for meek browser profile
Set an TOR_BROWSER_TOR_DATA_DIR environment variable before starting tor. meek-client-torbrowser uses this on OSX to determine the location of the meek browser profile. --- src/components/tl-process.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 403bc56..a91059b 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -417,13 +417,18 @@ TorProcessService.prototype = args.push("1"); }
+ // Set an environment variable that points to the Tor data directory. + // This is used by meek-client-torbrowser to find the location for + // the meek browser profile. + let env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + env.set("TOR_BROWSER_TOR_DATA_DIR", dataDir.path); + // On Windows, prepend the Tor program directory to PATH. This is // needed so that pluggable transports can find OpenSSL DLLs, etc. // See https://trac.torproject.org/projects/tor/ticket/10845 if (TorLauncherUtil.isWindows) { - var env = Cc["@mozilla.org/process/environment;1"] - .getService(Ci.nsIEnvironment); var path = exeFile.parent.path; if (env.exists("PATH")) path += ";" + env.get("PATH");