[tbb-commits] [tor-launcher/master] Bug #10425: geoip6 file is missing in TBB.

[brade at torproject.org]

commit 22ab705efb3fa112ad0e94d3792e23a508c71ace
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue May 27 11:27:25 2014 -0400

    Bug #10425: geoip6 file is missing in TBB.
    
    When starting tor, pass the geoip6 file location (within the tor data dir)
    via the GeoIPv6File command line config option.
---
 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 2efea99..4316a76 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -318,6 +318,9 @@ TorProcessService.prototype =
       var geoipFile = dataDir.clone();
       geoipFile.append("geoip");
 
+      var geoip6File = dataDir.clone();
+      geoip6File.append("geoip6");
+
       var args = [];
       if (torrcDefaultsFile)
       {
@@ -330,6 +333,8 @@ TorProcessService.prototype =
       args.push(dataDir.path);
       args.push("GeoIPFile");
       args.push(geoipFile.path);
+      args.push("GeoIPv6File");
+      args.push(geoip6File.path);
       args.push("HashedControlPassword");
       args.push(hashedPassword);