Commit 0082643c authored by Kathleen Brade's avatar Kathleen Brade Committed by Georg Koppen
Browse files

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.
parent 2014143e
...@@ -417,13 +417,18 @@ TorProcessService.prototype = ...@@ -417,13 +417,18 @@ TorProcessService.prototype =
args.push("1"); 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 // On Windows, prepend the Tor program directory to PATH. This is
// needed so that pluggable transports can find OpenSSL DLLs, etc. // needed so that pluggable transports can find OpenSSL DLLs, etc.
// See https://trac.torproject.org/projects/tor/ticket/10845 // See https://trac.torproject.org/projects/tor/ticket/10845
if (TorLauncherUtil.isWindows) if (TorLauncherUtil.isWindows)
{ {
var env = Cc["@mozilla.org/process/environment;1"]
.getService(Ci.nsIEnvironment);
var path = exeFile.parent.path; var path = exeFile.parent.path;
if (env.exists("PATH")) if (env.exists("PATH"))
path += ";" + env.get("PATH"); path += ";" + env.get("PATH");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment