[tor-commits] [tor-launcher/master] Clean up some TODO comments.

brade at torproject.org brade at torproject.org
Wed Apr 10 18:31:06 UTC 2013


commit a96aabda88d833d9a0ac8734214bedf916bf8fe9
Author: Kathy Brade <brade at torproject.org>
Date:   Wed Apr 10 14:30:47 2013 -0400

    Clean up some TODO comments.
---
 src/components/tl-process.js  |    5 +++--
 src/components/tl-protocol.js |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 6bff855..58ec1d1 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -200,7 +200,9 @@ TorProcessService.prototype =
 
     try
     {
-      // TODO: how can we control the CWD for tor?   Needs to match firefox dir.
+      // Ideally, we would cd to the Firefox application directory before
+      // starting tor (but we don't know how to do that).  Instead, we
+      // rely on the TBB launcher to start Firefox from the right place.
       var exeFile = this._getTorFile("tor");
       var torrcFile = this._getTorFile("torrc");
       var dataDir = this._getTorFile("tordatadir");
@@ -231,7 +233,6 @@ TorProcessService.prototype =
       args.push(torrcFile.path);
       args.push("DataDirectory");
       args.push(dataDir.path);
-// TODO: are there any charset issues with path?
       args.push("HashedControlPassword");
       args.push(hashedPassword);
 
diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index 15000a5..923d3f3 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -48,7 +48,7 @@ function TorProtocolService()
       this.mControlPassword = env.get("TOR_CONTROL_PASSWD");
     else if (env.exists("TOR_CONTROL_COOKIE_AUTH_FILE"))
     {
-      // TODO: test this code path.
+      // TODO: test this code path (TOR_CONTROL_COOKIE_AUTH_FILE).
       var cookiePath = env.get("TOR_CONTROL_COOKIE_AUTH_FILE");
       if ("" != cookiePath)
         this.mControlPassword = this._read_authentication_cookie(cookiePath);



More information about the tor-commits mailing list