[tor-commits] [tor-launcher/master] Bug 9114: Reorganize bundle directory structure for TBB 3.0.

[mikeperry at torproject.org]

commit f644a38729a2687d095eaa992e1ea00a1d3bb0ed
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Thu Jul 25 10:14:59 2013 -0400

    Bug 9114: Reorganize bundle directory structure for TBB 3.0.
    
    Include GeoIPFile (path) in tor command line args.
---
 src/components/tl-process.js |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index f4763c0..ed7e761 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -292,6 +292,9 @@ TorProcessService.prototype =
         return;
       }
 
+      var geoipFile = dataDir.clone();
+      geoipFile.append("geoip");
+
       var args = [];
       if (torrcDefaultsFile)
       {
@@ -302,6 +305,8 @@ TorProcessService.prototype =
       args.push(torrcFile.path);
       args.push("DataDirectory");
       args.push(dataDir.path);
+      args.push("GeoIPFile");
+      args.push(geoipFile.path);
       args.push("HashedControlPassword");
       args.push(hashedPassword);