$OpenBSD: patch-src_components_tl-process_js,v 1.4 2018/10/03 14:57:09 sthen Exp $

Let geoip/geoip6 file paths be set by prefs like everything else and let
the new getTorFile() deal with it.
Index: src/components/tl-process.js
--- src/components/tl-process.js.orig
+++ src/components/tl-process.js
@@ -374,6 +374,8 @@ TorProcessService.prototype =
       var torrcFile = TorLauncherUtil.getTorFile("torrc", true);
       var torrcDefaultsFile =
                     TorLauncherUtil.getTorFile("torrc-defaults", false);
+      var geoipFile = TorLauncherUtil.getTorFile("geoip", false);
+      var geoip6File = TorLauncherUtil.getTorFile("geoip6", false);
       var hashedPassword = this.mProtocolSvc.TorGetPassword(true);
       var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile();
       var controlPort = this.mProtocolSvc.TorGetControlPort();
@@ -399,19 +401,14 @@ TorProcessService.prototype =
         return;
       }
 
-      // The geoip and geoip6 files are in the same directory as torrc-defaults.
-      var geoipFile = torrcDefaultsFile.clone();
-      geoipFile.leafName = "geoip";
 
-      var geoip6File = torrcDefaultsFile.clone();
-      geoip6File.leafName = "geoip6";
-
       var args = [];
       if (torrcDefaultsFile)
       {
         args.push("--defaults-torrc");
         args.push(torrcDefaultsFile.path);
       }
+      args.push("--ignore-missing-torrc");
       args.push("-f");
       args.push(torrcFile.path);
       args.push("DataDirectory");
