From fe13fea1e53c15aa0cf0630ba874cb4b7e5c5ba0 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Thu, 26 Apr 2018 10:26:10 -0400
Subject: [PATCH] remove hard coded tor config options

---
 src/yggdrasil/config/tor.go | 5 ++---
 yggdrasil.go                | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/yggdrasil/config/tor.go b/src/yggdrasil/config/tor.go
index 19f612d..c169cbb 100644
--- a/src/yggdrasil/config/tor.go
+++ b/src/yggdrasil/config/tor.go
@@ -3,7 +3,6 @@ package config
 // TorConfig is the configuration structure for Tor Proxy related values
 type TorConfig struct {
 	OnionKeyfile string // hidden service private key for ADD_ONION (currently unimplemented)
-	SocksAddr    string // tor socks address
-	UseForAll    bool   // use tor proxy for all connections?
-	Enabled      bool   // use tor at all ?
+	ControlAddr  string // tor control port address
+	Enabled      bool
 }
diff --git a/yggdrasil.go b/yggdrasil.go
index 15f60ac..30c6a79 100644
--- a/yggdrasil.go
+++ b/yggdrasil.go
@@ -103,9 +103,6 @@ func generateConfig(isAutoconf bool) *nodeConfig {
 	cfg.IfMTU = core.DEBUG_GetTUNDefaultIfMTU()
 	cfg.IfTAPMode = core.DEBUG_GetTUNDefaultIfTAPMode()
 
-	cfg.Net.Tor.SocksAddr = "127.0.0.1:9050"
-	cfg.Net.Tor.UseForAll = false
-	cfg.Net.Tor.Enabled = true
 	return &cfg
 }