* : merge with master

2020-09-09 14:35:11 +03:00
parent b04e12e189 ccb903c9a0
commit e781ff0cae
38 changed files with 1194 additions and 176 deletions
--- a/dnsforward/dnsforward_http.go
+++ b/dnsforward/dnsforward_http.go
@@ -277,7 +277,7 @@ func ValidateUpstreams(upstreams []string) error {
 	return nil
 }

-var protocols = []string{"tls://", "https://", "tcp://", "sdns://"}
+var protocols = []string{"tls://", "https://", "tcp://", "sdns://", "quic://"}

 func validateUpstream(u string) (bool, error) {
 	// Check if user tries to specify upstream for domain