From d6d0d537612d2186b4149f3498ce55e2b0d2fd8f Mon Sep 17 00:00:00 2001
From: Simon Zolin <s.zolin@adguard.com>
Date: Thu, 31 Oct 2019 12:43:33 +0300
Subject: [PATCH 1/2] * DNS: use Quad9 as default server

---
 dnsforward/dnsforward.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dnsforward/dnsforward.go b/dnsforward/dnsforward.go
index 94de90cf..d83753a4 100644
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@@ -30,10 +30,9 @@ const (
 )
 
 var defaultDNS = []string{
-	"https://1.1.1.1/dns-query",
-	"https://1.0.0.1/dns-query",
+	"https://dns.quad9.net/dns-query",
 }
-var defaultBootstrap = []string{"1.1.1.1", "1.0.0.1"}
+var defaultBootstrap = []string{"9.9.9.9", "149.112.112.112"}
 
 // Server is the main way to start a DNS server.
 //
@@ -68,7 +67,7 @@ func NewServer(dnsFilter *dnsfilter.Dnsfilter, stats stats.Stats, queryLog query
 
 	if runtime.GOARCH == "mips" || runtime.GOARCH == "mipsle" {
 		// Use plain DNS on MIPS, encryption is too slow
-		defaultDNS = []string{"1.1.1.1", "1.0.0.1"}
+		defaultDNS = defaultBootstrap
 	}
 	return s
 }

From 82d0c3047b857651d351a7acd3f2e8bb262dfb4d Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Tue, 26 Nov 2019 16:06:08 +0300
Subject: [PATCH 2/2] + client: change DNS settings text and examples to Quad9

---
 client/src/__locales/en.json                           |  2 +-
 .../src/components/Settings/Dns/Upstream/Examples.js   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
index 6b0bc715..6be758f5 100644
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -106,7 +106,7 @@
     "encryption_settings": "Encryption settings",
     "dhcp_settings": "DHCP settings",
     "upstream_dns": "Upstream DNS servers",
-    "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> as an upstream.",
+    "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://www.quad9.net/' target='_blank'>Quad9</a> as an upstream.",
     "test_upstream_btn": "Test upstreams",
     "apply_btn": "Apply",
     "disabled_filtering_toast": "Disabled filtering",
diff --git a/client/src/components/Settings/Dns/Upstream/Examples.js b/client/src/components/Settings/Dns/Upstream/Examples.js
index d18d85ba..4a464a5e 100644
--- a/client/src/components/Settings/Dns/Upstream/Examples.js
+++ b/client/src/components/Settings/Dns/Upstream/Examples.js
@@ -23,10 +23,10 @@ const Examples = props => (
         <Trans>examples_title</Trans>:
         <ol className="leading-loose">
             <li>
-                <code>1.1.1.1</code> - {props.t('example_upstream_regular')}
+                <code>9.9.9.9</code> - {props.t('example_upstream_regular')}
             </li>
             <li>
-                <code>tls://1dot1dot1dot1.cloudflare-dns.com</code> –&nbsp;
+                <code>tls://dns.quad9.net</code> –&nbsp;
                 <span>
                     <Trans
                         components={[
@@ -45,7 +45,7 @@ const Examples = props => (
                 </span>
             </li>
             <li>
-                <code>https://cloudflare-dns.com/dns-query</code> –&nbsp;
+                <code>https://dns.quad9.net/dns-query</code> –&nbsp;
                 <span>
                     <Trans
                         components={[
@@ -64,7 +64,7 @@ const Examples = props => (
                 </span>
             </li>
             <li>
-                <code>tcp://1.1.1.1</code> – <Trans>example_upstream_tcp</Trans>
+                <code>tcp://9.9.9.9</code> – <Trans>example_upstream_tcp</Trans>
             </li>
             <li>
                 <code>sdns://...</code> –&nbsp;
@@ -102,7 +102,7 @@ const Examples = props => (
                 </span>
             </li>
             <li>
-                <code>[/example.local/]1.1.1.1</code> –&nbsp;
+                <code>[/example.local/]9.9.9.9</code> –&nbsp;
                 <span>
                     <Trans
                         components={[