Merge branch 'fix/542' into fix/596

This commit is contained in:
Aleksey Dmitrevskiy
2019-02-28 11:16:03 +03:00
6 changed files with 138 additions and 12 deletions

2
dns.go
View File

@@ -61,7 +61,7 @@ func generateServerConfig() dnsforward.ServerConfig {
for _, u := range config.DNS.UpstreamDNS {
opts := upstream.Options{
Timeout: dnsforward.DefaultTimeout,
Bootstrap: []string{config.DNS.BootstrapDNS},
Bootstrap: config.DNS.BootstrapDNS,
}
dnsUpstream, err := upstream.AddressToUpstream(u, opts)
if err != nil {