From 4e304e336d913589618d6bfbf592659015408f31 Mon Sep 17 00:00:00 2001
From: Casey Marshall <casey.marshall@canonical.com>
Date: Sun, 19 Nov 2017 15:54:16 -0600
Subject: [PATCH] Set GeoIPFile and GeoIPv6File to get rid of warnings.

Missing these options create warnings on Windows for some reason when
trying to generate the control password hash.
---
 agent/agent.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/agent/agent.go b/agent/agent.go
index 4c71e69..4f8519a 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -62,13 +62,17 @@ Log notice stdout
 			return nil, errors.Wrapf(err, "failed to create torrc")
 		}
 	}
+	geoIPFile := filepath.Join(cfg.Dir, "tor", "geoip")
+	geoIPv6File := filepath.Join(cfg.Dir, "tor", "geoip6")
 	cmd := exec.Command(cfg.Node.Agent.TorBinaryPath,
 		"-f", torrcPath,
 		"--Log", "notice stdout",
 		"--SocksPort", cfg.Node.Agent.SocksAddr,
 		"--ControlPort", cfg.Node.Agent.ControlAddr,
-		"--DataDirectory", dataDir,
 		"--HashedControlPassword", controlHash,
+		"--DataDirectory", dataDir,
+		"--GeoIPFile", geoIPFile,
+		"--GeoIPv6File", geoIPv6File,
 	)
 	cmd.Dir = dataDir
 	cmd.Stdout = os.Stdout