diff --git a/src/yggdrasil/config/tor.go b/src/yggdrasil/config/tor.go index 19f612d8..c169cbbe 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 15f60ac7..30c6a798 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 }