Merge pull request #1478 from wpaulino/resolve-tor-dns-host

config: only normalize and resolve tor DNS host if it has changed

config.go

@@ -438,14 +438,18 @@ func loadConfig() (*config, error) {
 	}
 	cfg.Tor.SOCKS = socks.String()
 
-	dns, err := lncfg.ParseAddressString(
+	// We'll only attempt to normalize and resolve the DNS host if it hasn't
-		cfg.Tor.DNS, strconv.Itoa(defaultTorDNSPort),
+	// changed, as it doesn't need to be done for the default.
-		cfg.net.ResolveTCPAddr,
+	if cfg.Tor.DNS != defaultTorDNS {
-	)
+		dns, err := lncfg.ParseAddressString(
-	if err != nil {
+			cfg.Tor.DNS, strconv.Itoa(defaultTorDNSPort),
-		return nil, err
+			cfg.net.ResolveTCPAddr,
+		)
+		if err != nil {
+			return nil, err
+		}
+		cfg.Tor.DNS = dns.String()
 	}
-	cfg.Tor.DNS = dns.String()
 
 	control, err := lncfg.ParseAddressString(
 		cfg.Tor.Control, strconv.Itoa(defaultTorControlPort),