Datasets:

code-philia
/

CoEdPilot-generator

Dataset card Viewer Files Files and versions Community

Split (3)

train · 2.08M rows

docstring_tokens stringlengths 0 76.5k	code_tokens stringlengths 75 1.81M	label_window sequencelengths 4 2.12k	html_url stringlengths 74 116	file_name stringlengths 3 311
if !force && time.Since(f.LastUpdated) <= updatePeriod {	<mask> if !filter.Enabled { <mask> continue <mask> } <mask> <mask> if !force && time.Since(filter.LastUpdated) <= updatePeriod { <mask> continue <mask> } <mask> <mask> updated, err := filter.update() <mask> if err != nil { </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove updated, err := filter.update() </s> add var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update() </s> remove if !filter.Enabled { </s> add if !f.Enabled { </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err) </s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err) </s> remove os.Chtimes(filter.Path(), mtime, mtime) filter.LastUpdated = mtime </s> add e := os.Chtimes(uf.Path(), mtime, mtime) if e != nil { log.Error("os.Chtimes(): %v", e) } uf.LastUpdated = mtime } config.Lock() for k := range config.Filters { f := &config.Filters[k] if f.ID != uf.ID \|\| f.URL != uf.URL { continue } f.LastUpdated = uf.LastUpdated if !updated { continue } log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) f.Name = uf.Name f.Rules = uf.Rules f.RulesCount = uf.RulesCount f.checksum = uf.checksum updateCount++ </s> remove err = filter.save() </s> add err = uf.save()	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update()	<mask> if !force && time.Since(filter.LastUpdated) <= updatePeriod { <mask> continue <mask> } <mask> <mask> updated, err := filter.update() <mask> if err != nil { <mask> log.Printf("Failed to update filter %s: %s\n", filter.URL, err) <mask> continue <mask> } <mask> if updated { </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err) </s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err) </s> remove if !force && time.Since(filter.LastUpdated) <= updatePeriod { </s> add if !force && time.Since(f.LastUpdated) <= updatePeriod { </s> remove if !filter.Enabled { </s> add if !f.Enabled { </s> remove err = filter.save() </s> add err = uf.save() </s> remove log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) </s> add log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
log.Printf("Failed to update filter %s: %s\n", uf.URL, err)	<mask> } <mask> <mask> updated, err := filter.update() <mask> if err != nil { <mask> log.Printf("Failed to update filter %s: %s\n", filter.URL, err) <mask> continue <mask> } <mask> if updated { <mask> // Saving it to the filters dir now <mask> err = filter.save() </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove updated, err := filter.update() </s> add var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update() </s> remove err = filter.save() </s> add err = uf.save() </s> remove log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) </s> add log.Printf("Failed to save the updated filter %d: %s", uf.ID, err) </s> remove if !force && time.Since(filter.LastUpdated) <= updatePeriod { </s> add if !force && time.Since(f.LastUpdated) <= updatePeriod { </s> remove updateCount++ </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
err = uf.save()	<mask> continue <mask> } <mask> if updated { <mask> // Saving it to the filters dir now <mask> err = filter.save() <mask> if err != nil { <mask> log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) <mask> continue <mask> } <mask> </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) </s> add log.Printf("Failed to save the updated filter %d: %s", uf.ID, err) </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err) </s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err) </s> remove updateCount++ </s> add </s> remove updated, err := filter.update() </s> add var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update() </s> remove os.Chtimes(filter.Path(), mtime, mtime) filter.LastUpdated = mtime </s> add e := os.Chtimes(uf.Path(), mtime, mtime) if e != nil { log.Error("os.Chtimes(): %v", e) } uf.LastUpdated = mtime } config.Lock() for k := range config.Filters { f := &config.Filters[k] if f.ID != uf.ID \|\| f.URL != uf.URL { continue } f.LastUpdated = uf.LastUpdated if !updated { continue } log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) f.Name = uf.Name f.Rules = uf.Rules f.RulesCount = uf.RulesCount f.checksum = uf.checksum updateCount++	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)	<mask> if updated { <mask> // Saving it to the filters dir now <mask> err = filter.save() <mask> if err != nil { <mask> log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) <mask> continue <mask> } <mask> <mask> updateCount++ <mask> </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove err = filter.save() </s> add err = uf.save() </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err) </s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err) </s> remove updateCount++ </s> add </s> remove updated, err := filter.update() </s> add var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update()	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
	<mask> log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) <mask> continue <mask> } <mask> <mask> updateCount++ <mask> <mask> } else { <mask> mtime := time.Now() <mask> os.Chtimes(filter.Path(), mtime, mtime) <mask> filter.LastUpdated = mtime <mask> } </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove os.Chtimes(filter.Path(), mtime, mtime) filter.LastUpdated = mtime </s> add e := os.Chtimes(uf.Path(), mtime, mtime) if e != nil { log.Error("os.Chtimes(): %v", e) } uf.LastUpdated = mtime } config.Lock() for k := range config.Filters { f := &config.Filters[k] if f.ID != uf.ID \|\| f.URL != uf.URL { continue } f.LastUpdated = uf.LastUpdated if !updated { continue } log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) f.Name = uf.Name f.Rules = uf.Rules f.RulesCount = uf.RulesCount f.checksum = uf.checksum updateCount++ </s> remove log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) </s> add log.Printf("Failed to save the updated filter %d: %s", uf.ID, err) </s> remove config.Unlock() </s> add </s> remove err = filter.save() </s> add err = uf.save() </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err) </s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err)	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
e := os.Chtimes(uf.Path(), mtime, mtime) if e != nil { log.Error("os.Chtimes(): %v", e) } uf.LastUpdated = mtime } config.Lock() for k := range config.Filters { f := &config.Filters[k] if f.ID != uf.ID \|\| f.URL != uf.URL { continue } f.LastUpdated = uf.LastUpdated if !updated { continue } log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) f.Name = uf.Name f.Rules = uf.Rules f.RulesCount = uf.RulesCount f.checksum = uf.checksum updateCount++	<mask> updateCount++ <mask> <mask> } else { <mask> mtime := time.Now() <mask> os.Chtimes(filter.Path(), mtime, mtime) <mask> filter.LastUpdated = mtime <mask> } <mask> } <mask> config.Unlock() <mask> <mask> if updateCount > 0 && isRunning() { </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove updateCount++ </s> add </s> remove config.Unlock() </s> add </s> remove updated, err := filter.update() </s> add var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update() </s> remove if !filter.Enabled { </s> add if !f.Enabled {	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
config.Unlock()	<mask> f.checksum = uf.checksum <mask> updateCount++ <mask> } <mask> } <mask> <mask> if updateCount > 0 && isRunning() { <mask> err := reconfigureDNSServer() <mask> if err != nil { <mask> msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconfigure DNS server with the new filters: %s", err) </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove config.Unlock() </s> add </s> remove os.Chtimes(filter.Path(), mtime, mtime) filter.LastUpdated = mtime </s> add e := os.Chtimes(uf.Path(), mtime, mtime) if e != nil { log.Error("os.Chtimes(): %v", e) } uf.LastUpdated = mtime } config.Lock() for k := range config.Filters { f := &config.Filters[k] if f.ID != uf.ID \|\| f.URL != uf.URL { continue } f.LastUpdated = uf.LastUpdated if !updated { continue } log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) f.Name = uf.Name f.Rules = uf.Rules f.RulesCount = uf.RulesCount f.checksum = uf.checksum updateCount++ </s> remove updated, err := filter.update() </s> add var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update() </s> remove log.Printf("Failed to save the updated filter %d: %s", filter.ID, err) </s> add log.Printf("Failed to save the updated filter %d: %s", uf.ID, err) </s> remove if !force && time.Since(filter.LastUpdated) <= updatePeriod { </s> add if !force && time.Since(f.LastUpdated) <= updatePeriod {	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
	<mask> os.Chtimes(filter.Path(), mtime, mtime) <mask> filter.LastUpdated = mtime <mask> } <mask> } <mask> config.Unlock() <mask> <mask> if updateCount > 0 && isRunning() { <mask> err := reconfigureDNSServer() <mask> if err != nil { <mask> msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconfigure DNS server with the new filters: %s", err) </s> * filters: rework update mechanism so that UI doesn't get locked while update is in progress </s> remove os.Chtimes(filter.Path(), mtime, mtime) filter.LastUpdated = mtime </s> add e := os.Chtimes(uf.Path(), mtime, mtime) if e != nil { log.Error("os.Chtimes(): %v", e) } uf.LastUpdated = mtime } config.Lock() for k := range config.Filters { f := &config.Filters[k] if f.ID != uf.ID \|\| f.URL != uf.URL { continue } f.LastUpdated = uf.LastUpdated if !updated { continue } log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) f.Name = uf.Name f.Rules = uf.Rules f.RulesCount = uf.RulesCount f.checksum = uf.checksum updateCount++ </s> remove updateCount++ </s> add </s> remove updated, err := filter.update() </s> add var uf filter uf.ID = f.ID uf.URL = f.URL uf.checksum = f.checksum updateFilters = append(updateFilters, uf) } config.RUnlock() updateCount := 0 for i := range updateFilters { uf := &updateFilters[i] updated, err := uf.update() </s> remove if !force && time.Since(filter.LastUpdated) <= updatePeriod { </s> add if !force && time.Since(f.LastUpdated) <= updatePeriod {	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a	filter.go
"version": "11.7.2", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz", "integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==",	<mask> } <mask> } <mask> }, <mask> "react-i18next": { <mask> "version": "11.4.0", <mask> "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz", <mask> "integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==", <mask> "requires": { <mask> "@babel/runtime": "^7.3.1", <mask> "html-parse-stringify2": "2.0.1" <mask> } <mask> }, </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove import { useTranslation } from 'react-i18next'; </s> add import { Trans } from 'react-i18next'; </s> remove BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, </s> add BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK,	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/package-lock.json
"react-i18next": "^11.7.2",	<mask> "query-string": "^6.13.1", <mask> "react": "^16.13.1", <mask> "react-click-outside": "^3.0.1", <mask> "react-dom": "^16.13.1", <mask> "react-i18next": "^11.4.0", <mask> "react-modal": "^3.11.2", <mask> "react-popper-tooltip": "^2.11.1", <mask> "react-redux": "^7.2.0", <mask> "react-redux-loading-bar": "^4.6.0", <mask> "react-router-dom": "^5.2.0", </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove "version": "11.4.0", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz", "integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==", </s> add "version": "11.7.2", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz", "integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==", </s> remove "update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>follow the steps</a> to update manually.", </s> add "update_failed": "Auto-update failed. Please <a>follow these steps</a> to update manually.", </s> remove BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, </s> add BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK,	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/package.json
"update_failed": "Auto-update failed. Please <a>follow these steps</a> to update manually.",	<mask> "down": "Down", <mask> "fix": "Fix", <mask> "dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.", <mask> "update_now": "Update now", <mask> "update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>follow the steps</a> to update manually.", <mask> "processing_update": "Please wait, AdGuard Home is being updated", <mask> "clients_title": "Clients", <mask> "clients_desc": "Configure devices connected to AdGuard Home", <mask> "settings_global": "Global", <mask> "settings_custom": "Custom", </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove "react-i18next": "^11.4.0", </s> add "react-i18next": "^11.7.2",	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/__locales/en.json
import React from 'react';	<mask> import axios from 'axios'; <mask> <mask> import endsWith from 'lodash/endsWith'; <mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import { splitByNewLine, sortClients } from '../helpers/helpers'; <mask> import { <mask> BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK, <mask> } from '../helpers/constants'; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, </s> add BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK, </s> remove import { useTranslation } from 'react-i18next'; </s> add import { Trans } from 'react-i18next'; </s> remove "version": "11.4.0", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz", "integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==", </s> add "version": "11.7.2", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz", "integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==", </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove const { t } = useTranslation(); </s> add	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/actions/index.js
BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK,	<mask> import endsWith from 'lodash/endsWith'; <mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import { splitByNewLine, sortClients } from '../helpers/helpers'; <mask> import { <mask> BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, <mask> } from '../helpers/constants'; <mask> import { areEqualVersions } from '../helpers/version'; <mask> import { getTlsStatus } from './encryption'; <mask> import apiClient from '../api/Api'; <mask> import { addErrorToast, addNoticeToast, addSuccessToast } from './toasts'; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove import { useTranslation } from 'react-i18next'; </s> add import { Trans } from 'react-i18next'; </s> remove "version": "11.4.0", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz", "integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==", </s> add "version": "11.7.2", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz", "integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==", </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove const { t } = useTranslation(); </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/actions/index.js
const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options }));	<mask> const { dnsVersion } = getState().dashboard; <mask> <mask> dispatch(getUpdateRequest()); <mask> const handleRequestError = () => { <mask> dispatch(addNoticeToast({ error: 'update_failed' })); <mask> dispatch(getUpdateFailure()); <mask> }; <mask> <mask> const handleRequestSuccess = (response) => { <mask> const responseVersion = response.data?.version; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove const { t } = useTranslation(); </s> add </s> remove export const SUCCESS_TOAST_TIMEOUT = 5000; export const FAILURE_TOAST_TIMEOUT = 30000; </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/actions/index.js
import { Trans } from 'react-i18next';	<mask> import React, { useEffect, useState } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { useTranslation } from 'react-i18next'; <mask> import { useDispatch } from 'react-redux'; <mask> import { TOAST_TIMEOUTS } from '../../helpers/constants'; <mask> import { removeToast } from '../../actions'; <mask> <mask> const Toast = ({ </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, </s> add BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK, </s> remove "version": "11.4.0", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz", "integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==", </s> add "version": "11.7.2", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz", "integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==", </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options }));	[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/components/Toasts/Toast.js
options,	<mask> const Toast = ({ <mask> id, <mask> message, <mask> type, <mask> }) => { <mask> const dispatch = useDispatch(); <mask> const [timerId, setTimerId] = useState(null); <mask> <mask> const clearRemoveToastTimeout = () => clearTimeout(timerId); </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove const { t } = useTranslation(); </s> add </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove export const SUCCESS_TOAST_TIMEOUT = 5000; export const FAILURE_TOAST_TIMEOUT = 30000; </s> add	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/components/Toasts/Toast.js
	<mask> id, <mask> message, <mask> type, <mask> }) => { <mask> const { t } = useTranslation(); <mask> const dispatch = useDispatch(); <mask> const [timerId, setTimerId] = useState(null); <mask> <mask> const clearRemoveToastTimeout = () => clearTimeout(timerId); <mask> const removeCurrentToast = () => dispatch(removeToast(id)); </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove export const SUCCESS_TOAST_TIMEOUT = 5000; export const FAILURE_TOAST_TIMEOUT = 30000; </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/components/Toasts/Toast.js
<p className="toast__content"> <Trans i18nKey={message} {...options} /> </p>	<mask> <mask> return <div className={`toast toast--${type}`} <mask> onMouseOver={clearRemoveToastTimeout} <mask> onMouseOut={setRemoveToastTimeout}> <mask> <p className="toast__content">{t(message)}</p> <mask> <button className="toast__dismiss" onClick={removeCurrentToast}> <mask> <svg stroke="#fff" fill="none" width="20" height="20" strokeWidth="2" <mask> viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> <mask> <path d="m18 6-12 12" /> <mask> <path d="m6 6 12 12" /> </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove "react-i18next": "^11.4.0", </s> add "react-i18next": "^11.7.2", </s> remove "update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>follow the steps</a> to update manually.", </s> add "update_failed": "Auto-update failed. Please <a>follow these steps</a> to update manually.",	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/components/Toasts/Toast.js
options: PropTypes.object,	<mask> Toast.propTypes = { <mask> id: PropTypes.string.isRequired, <mask> message: PropTypes.string.isRequired, <mask> type: PropTypes.string.isRequired, <mask> }; <mask> <mask> export default Toast; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove [TOAST_TYPES.SUCCESS]: 5000, [TOAST_TYPES.ERROR]: 30000, [TOAST_TYPES.NOTICE]: 30000, </s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT,	[ "keep", "keep", "keep", "add", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/components/Toasts/Toast.js
export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update';	<mask> <mask> export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html'; <mask> export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse'; <mask> <mask> export const ADDRESS_IN_USE_TEXT = 'address already in use'; <mask> <mask> export const INSTALL_FIRST_STEP = 1; <mask> export const INSTALL_TOTAL_STEPS = 5; <mask> <mask> export const SETTINGS_NAMES = { </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove export const SUCCESS_TOAST_TIMEOUT = 5000; export const FAILURE_TOAST_TIMEOUT = 30000; </s> add </s> remove [TOAST_TYPES.SUCCESS]: 5000, [TOAST_TYPES.ERROR]: 30000, [TOAST_TYPES.NOTICE]: 30000, </s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, </s> remove const { t } = useTranslation(); </s> add	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/helpers/constants.js
	<mask> <mask> export const DEBOUNCE_TIMEOUT = 300; <mask> export const DEBOUNCE_FILTER_TIMEOUT = 500; <mask> export const CHECK_TIMEOUT = 1000; <mask> export const SUCCESS_TOAST_TIMEOUT = 5000; <mask> export const FAILURE_TOAST_TIMEOUT = 30000; <mask> export const HIDE_TOOLTIP_DELAY = 300; <mask> export const SHOW_TOOLTIP_DELAY = 200; <mask> export const MODAL_OPEN_TIMEOUT = 150; <mask> <mask> export const UNSAFE_PORTS = [ </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove [TOAST_TYPES.SUCCESS]: 5000, [TOAST_TYPES.ERROR]: 30000, [TOAST_TYPES.NOTICE]: 30000, </s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, </s> remove const { t } = useTranslation(); </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/helpers/constants.js
export const SUCCESS_TOAST_TIMEOUT = 5000; export const FAILURE_TOAST_TIMEOUT = 30000;	<mask> NOTICE: 'notice', <mask> }; <mask> <mask> export const TOAST_TIMEOUTS = { <mask> [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, <mask> [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, <mask> [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, <mask> }; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove [TOAST_TYPES.SUCCESS]: 5000, [TOAST_TYPES.ERROR]: 30000, [TOAST_TYPES.NOTICE]: 30000, </s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options }));	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/helpers/constants.js
[TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT,	<mask> NOTICE: 'notice', <mask> }; <mask> <mask> export const TOAST_TIMEOUTS = { <mask> [TOAST_TYPES.SUCCESS]: 5000, <mask> [TOAST_TYPES.ERROR]: 30000, <mask> [TOAST_TYPES.NOTICE]: 30000, <mask> }; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options }));	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/helpers/constants.js
options: payload.options,	<mask> id: nanoid(), <mask> message, <mask> type: TOAST_TYPES.ERROR, <mask> }; <mask> <mask> const newState = { ...state, notices: [...state.notices, errorToast] }; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove const { t } = useTranslation(); </s> add	[ "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/reducers/toasts.js
options: payload.options,	<mask> id: nanoid(), <mask> message: payload.error.toString(), <mask> type: TOAST_TYPES.NOTICE, <mask> }; <mask> <mask> const newState = { ...state, notices: [...state.notices, noticeToast] }; <mask> return newState; <mask> }, </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the following: commit a1a1d4fe74dd414f83477d972bc07062e2c890ab Merge: 9535e109 84938c56 Author: ArtemBaskal <[email protected]> Date: Tue Sep 8 10:21:47 2020 +0300 Merge branch 'master' into fix/2062 commit 9535e10934c57c2592df234a030bad183c0086cd Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 13:59:57 2020 +0300 Fix translation commit e6f912d1d2793fd008c22b4418681abcc54896d0 Author: ArtemBaskal <[email protected]> Date: Mon Sep 7 12:03:45 2020 +0300 - client: Add link to 'update_failed' error toast </s> remove dispatch(addNoticeToast({ error: 'update_failed' })); </s> add const options = { components: { a: <a href={GETTING_STARTED_LINK} target="_blank" rel="noopener noreferrer" />, }, }; dispatch(addNoticeToast({ error: 'update_failed', options })); </s> remove [TOAST_TYPES.SUCCESS]: 5000, [TOAST_TYPES.ERROR]: 30000, [TOAST_TYPES.NOTICE]: 30000, </s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT,	[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2	client/src/reducers/toasts.js
TLSCiphers []uint16 // list of TLS ciphers to use	<mask> TLSAllowUnencryptedDOH bool <mask> <mask> TLSv12Roots *x509.CertPool // list of root CAs for TLSv1.2 <mask> <mask> // Called when the configuration is changed by HTTP request <mask> ConfigModified func() <mask> <mask> // Register an HTTP handler </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	dnsforward/dnsforward.go
upstream.CipherSuites = s.conf.TLSCiphers	<mask> } <mask> upstream.RootCAs = s.conf.TLSv12Roots <mask> <mask> if len(proxyConfig.Upstreams) == 0 { <mask> log.Fatal("len(proxyConfig.Upstreams) == 0") <mask> } <mask> <mask> if !webRegistered && s.conf.HTTPRegister != nil { </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	dnsforward/dnsforward.go
newconfig.TLSCiphers = Context.tlsCiphers	<mask> } <mask> newconfig.TLSv12Roots = Context.tlsRoots <mask> newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH <mask> <mask> newconfig.FilterHandler = applyAdditionalFiltering <mask> newconfig.GetUpstreamsByClient = getUpstreamsByClient <mask> return newconfig </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	home/dns.go
tlsCiphers []uint16 // list of TLS ciphers to use	<mask> disableUpdate bool // If set, don't check for updates <mask> controlLock sync.Mutex <mask> tlsRoots x509.CertPool // list of root CAs for TLSv1.2 <mask> transport http.Transport <mask> client *http.Client <mask> appSignalChannel chan os.Signal // Channel for receiving OS signals by the console app <mask> // runningAsService flag is set to true when options are passed from the service runner </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	home/home.go
Context.tlsCiphers = util.InitTLSCiphers()	<mask> initConfig() <mask> <mask> Context.tlsRoots = util.LoadSystemRootCAs() <mask> Context.transport = &http.Transport{ <mask> DialContext: customDialContext, <mask> Proxy: getHTTPProxy, <mask> TLSClientConfig: &tls.Config{ </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	home/home.go
CipherSuites: Context.tlsCiphers,	<mask> MinVersion: tls.VersionTLS12, <mask> RootCAs: Context.tlsRoots, <mask> }, <mask> } <mask> <mask> printHTTPAddresses("https") <mask> err := w.httpsServer.server.ListenAndServeTLS("", "") <mask> if err != http.ErrServerClosed { </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	home/web.go
"crypto/tls"	<mask> package util <mask> <mask> import ( <mask> "crypto/x509" <mask> "io/ioutil" <mask> "os" <mask> "runtime" </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	util/tls.go
"golang.org/x/sys/cpu"	<mask> "runtime" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> // LoadSystemRootCAs - load root CAs from the system <mask> // Return the x509 certificate pool object </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90abcce573a8e930446ba153565e553e6b81d5 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:53 2020 +0300 minor commit a1914c5f41425e82cdedc9716bce84470afab65b Merge: 72c53673 c8285c41 Author: Simon Zolin <[email protected]> Date: Fri Mar 20 19:17:21 2020 +0300 Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers commit 72c536737e0502bb397562ade47aedb9f2ae4494 Author: Simon Zolin <[email protected]> Date: Wed Mar 4 18:16:24 2020 +0300 + DNS, Web: use only secure TLSv1.2 ciphers	[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c	util/tls.go
github.com/AdguardTeam/dnsproxy v0.44.0	<mask> <mask> go 1.18 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.43.1 <mask> github.com/AdguardTeam/golibs v0.10.9 <mask> github.com/AdguardTeam/urlfilter v0.16.0 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.3 <mask> github.com/digineo/go-ipset/v2 v2.2.1 </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.43.1 h1:E777KfQAi+VurOoWEdGQ5iqjSOOAzzbTfLOEzj8heCs= github.com/AdguardTeam/dnsproxy v0.43.1/go.mod h1:JUGTm5dmlll47JltztsT0N//pVJjdg6zu0SNeUeaA7g= </s> add github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE= github.com/AdguardTeam/dnsproxy v0.44.0/go.mod h1:HsxYYW/bC8uo+4eX9pRW21hFD6gWZdrvcfBb1R6/AzU= </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c= golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.mod
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8	<mask> github.com/miekg/dns v1.1.50 <mask> github.com/stretchr/testify v1.7.1 <mask> github.com/ti-mo/netfilter v0.4.0 <mask> go.etcd.io/bbolt v1.3.6 <mask> golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa <mask> golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e <mask> golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 <mask> golang.org/x/sys v0.0.0-20220731174439-a90be440212d <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 <mask> gopkg.in/yaml.v3 v3.0.1 </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c= golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.mod
golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2	<mask> github.com/ti-mo/netfilter v0.4.0 <mask> go.etcd.io/bbolt v1.3.6 <mask> golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa <mask> golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e <mask> golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 <mask> golang.org/x/sys v0.0.0-20220731174439-a90be440212d <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 <mask> gopkg.in/yaml.v3 v3.0.1 <mask> howett.net/plist v1.0.0 <mask> ) <mask> </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c= golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.mod
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect	<mask> github.com/josharian/native v1.0.0 // indirect <mask> github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect <mask> github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect <mask> github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect <mask> github.com/mdlayher/packet v1.0.0 // indirect <mask> github.com/mdlayher/socket v0.2.3 // indirect <mask> github.com/nxadm/tail v1.4.8 // indirect <mask> github.com/onsi/ginkgo v1.16.5 // indirect <mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 h1:7m/WlWcSROrcK5NxuXaxYD32BZqe/LEEnBrWcH/cOqQ= </s> add </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.mod
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect	<mask> github.com/pkg/errors v0.9.1 // indirect <mask> github.com/pmezard/go-difflib v1.0.0 // indirect <mask> github.com/stretchr/objx v0.1.1 // indirect <mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect <mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect <mask> golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect <mask> golang.org/x/text v0.3.7 // indirect <mask> golang.org/x/tools v0.1.12 // indirect <mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect <mask> ) </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect </s> add github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.mod
github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE= github.com/AdguardTeam/dnsproxy v0.44.0/go.mod h1:HsxYYW/bC8uo+4eX9pRW21hFD6gWZdrvcfBb1R6/AzU=	<mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= <mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= <mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= <mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= <mask> github.com/AdguardTeam/dnsproxy v0.43.1 h1:E777KfQAi+VurOoWEdGQ5iqjSOOAzzbTfLOEzj8heCs= <mask> github.com/AdguardTeam/dnsproxy v0.43.1/go.mod h1:JUGTm5dmlll47JltztsT0N//pVJjdg6zu0SNeUeaA7g= <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= <mask> github.com/AdguardTeam/golibs v0.10.9 h1:F9oP2da0dQ9RQDM1lGR7LxUTfUWu8hEFOs4icwAkKM0= <mask> github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14= </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.43.1 </s> add github.com/AdguardTeam/dnsproxy v0.44.0 </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c= golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.sum
	<mask> github.com/marten-seemann/qtls-go1-17 v0.1.2 h1:JADBlm0LYiVbuSySCHeY863dNkcpMmDR7s0bLKJeYlQ= <mask> github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM= <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= <mask> github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 h1:7m/WlWcSROrcK5NxuXaxYD32BZqe/LEEnBrWcH/cOqQ= <mask> github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= <mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y= <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE= <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og= </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect </s> add github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.sum
github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU= github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=	<mask> github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM= <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= <mask> github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= <mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y= <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE= <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og= <mask> github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= <mask> github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 h1:7m/WlWcSROrcK5NxuXaxYD32BZqe/LEEnBrWcH/cOqQ= </s> add </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect </s> add github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.sum
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c= golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=	<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= <mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= <mask> golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= <mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= <mask> golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= <mask> golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= <mask> golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= <mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.sum
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=	<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= <mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= <mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= <mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= <mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= <mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= <mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= <mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= <mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= <mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= <mask> golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c= golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.sum
golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=	<mask> golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= <mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= <mask> golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= <mask> golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= <mask> golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= <mask> golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= <mask> golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= <mask> golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= <mask> golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= <mask> golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= <mask> golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> add golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c= golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.sum
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=	<mask> golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= <mask> golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= <mask> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= <mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= <mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= <mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= </s> Pull request: upd-dnsproxy Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 3c5b683e96191b9cf0abf35229c3c665370d782e Author: Ainar Garipov <[email protected]> Date: Thu Aug 18 18:04:13 2022 +0300 all: upd dnsproxy </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa </s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0= golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63	go.sum
	<mask> "object-assign": "^4.1.1", <mask> "prop-types": "^15.6.0" <mask> } <mask> }, <mask> "react-fast-compare": { <mask> "version": "2.0.4", <mask> "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", <mask> "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" <mask> }, <mask> "react-helmet": { <mask> "version": "5.2.1", <mask> "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", <mask> "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", <mask> "requires": { <mask> "object-assign": "^4.1.1", <mask> "prop-types": "^15.5.4", <mask> "react-fast-compare": "^2.0.2", <mask> "react-side-effect": "^1.1.0" <mask> } <mask> }, <mask> "react-i18next": { <mask> "version": "8.3.8", <mask> "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-8.3.8.tgz", <mask> "integrity": "sha512-ZcSpakSBcDxPJkl34fv/SI0TaoTDvVDrk4WpDF+WElorine+dHUjGMAA6RG5Km2KcLNW1t4GLunHprgKiqDrSw==", <mask> "requires": { </s> + client: add meta tag to index.html </s> remove "react-side-effect": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", "requires": { "shallowequal": "^1.0.1" } }, </s> add </s> remove import { Helmet } from 'react-helmet'; </s> add </s> remove "shallowequal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, </s> add </s> remove "react-helmet": "^5.2.1", </s> add </s> remove <Helmet> <meta httpEquiv="x-dns-prefetch-control" content="off" /> </Helmet> </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13	client/package-lock.json
	<mask> "requires": { <mask> "prop-types": "^15.6.0" <mask> } <mask> }, <mask> "react-side-effect": { <mask> "version": "1.2.0", <mask> "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", <mask> "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", <mask> "requires": { <mask> "shallowequal": "^1.0.1" <mask> } <mask> }, <mask> "react-table": { <mask> "version": "6.10.3", <mask> "resolved": "https://registry.npmjs.org/react-table/-/react-table-6.10.3.tgz", <mask> "integrity": "sha512-sVlq2/rxVaQJywGD95+qGiMr/SMHFIFnXdx619BLOWE/Os5FOGtV6pQJNAjZixbQZiOu7dmBO1kME28uxh6wmA==", <mask> "requires": { </s> + client: add meta tag to index.html </s> remove "react-fast-compare": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, "react-helmet": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", "requires": { "object-assign": "^4.1.1", "prop-types": "^15.5.4", "react-fast-compare": "^2.0.2", "react-side-effect": "^1.1.0" } }, </s> add </s> remove "shallowequal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, </s> add </s> remove import { Helmet } from 'react-helmet'; </s> add </s> remove <Helmet> <meta httpEquiv="x-dns-prefetch-control" content="off" /> </Helmet> </s> add </s> remove "react-helmet": "^5.2.1", </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13	client/package-lock.json
	<mask> "inherits": "^2.0.1", <mask> "safe-buffer": "^5.0.1" <mask> } <mask> }, <mask> "shallowequal": { <mask> "version": "1.1.0", <mask> "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", <mask> "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" <mask> }, <mask> "shebang-command": { <mask> "version": "1.2.0", <mask> "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", <mask> "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", <mask> "dev": true, </s> + client: add meta tag to index.html </s> remove "react-side-effect": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", "requires": { "shallowequal": "^1.0.1" } }, </s> add </s> remove import { Helmet } from 'react-helmet'; </s> add </s> remove "react-fast-compare": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, "react-helmet": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", "requires": { "object-assign": "^4.1.1", "prop-types": "^15.5.4", "react-fast-compare": "^2.0.2", "react-side-effect": "^1.1.0" } }, </s> add </s> remove <Helmet> <meta httpEquiv="x-dns-prefetch-control" content="off" /> </Helmet> </s> add </s> remove "react-helmet": "^5.2.1", </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13	client/package-lock.json
	<mask> "prop-types": "^15.7.2", <mask> "react": "^16.4.0", <mask> "react-click-outside": "^3.0.1", <mask> "react-dom": "^16.4.0", <mask> "react-helmet": "^5.2.1", <mask> "react-i18next": "^8.2.0", <mask> "react-modal": "^3.4.5", <mask> "react-redux": "^5.0.7", <mask> "react-redux-loading-bar": "^4.0.7", <mask> "react-router-dom": "^4.2.2", </s> + client: add meta tag to index.html </s> remove "react-fast-compare": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, "react-helmet": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", "requires": { "object-assign": "^4.1.1", "prop-types": "^15.5.4", "react-fast-compare": "^2.0.2", "react-side-effect": "^1.1.0" } }, </s> add </s> remove <Helmet> <meta httpEquiv="x-dns-prefetch-control" content="off" /> </Helmet> </s> add </s> remove import { Helmet } from 'react-helmet'; </s> add </s> remove "shallowequal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, </s> add </s> remove "react-side-effect": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", "requires": { "shallowequal": "^1.0.1" } }, </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13	client/package.json
	<mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import endsWith from 'lodash/endsWith'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import { HashLink as Link } from 'react-router-hash-link'; <mask> import { Helmet } from 'react-helmet'; <mask> <mask> import { <mask> formatTime, <mask> formatDateTime, <mask> } from '../../helpers/helpers'; </s> + client: add meta tag to index.html </s> remove "react-side-effect": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", "requires": { "shallowequal": "^1.0.1" } }, </s> add </s> remove "react-fast-compare": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, "react-helmet": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", "requires": { "object-assign": "^4.1.1", "prop-types": "^15.5.4", "react-fast-compare": "^2.0.2", "react-side-effect": "^1.1.0" } }, </s> add </s> remove "shallowequal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, </s> add </s> remove <Helmet> <meta httpEquiv="x-dns-prefetch-control" content="off" /> </Helmet> </s> add </s> remove "react-helmet": "^5.2.1", </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13	client/src/components/Logs/index.js
	<mask> ); <mask> <mask> return ( <mask> <Fragment> <mask> <Helmet> <mask> <meta httpEquiv="x-dns-prefetch-control" content="off" /> <mask> </Helmet> <mask> <PageTitle title={t('query_log')}>{refreshButton}</PageTitle> <mask> {enabled && processingGetConfig && <Loading />} <mask> {enabled && !processingGetConfig && ( <mask> <Fragment> <mask> <Filters </s> + client: add meta tag to index.html </s> remove import { Helmet } from 'react-helmet'; </s> add </s> remove "react-helmet": "^5.2.1", </s> add </s> remove "shallowequal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, </s> add </s> remove "react-side-effect": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", "requires": { "shallowequal": "^1.0.1" } }, </s> add </s> remove "react-fast-compare": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, "react-helmet": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", "requires": { "object-assign": "^4.1.1", "prop-types": "^15.5.4", "react-fast-compare": "^2.0.2", "react-side-effect": "^1.1.0" } }, </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13	client/src/components/Logs/index.js
export const getDnsAddress = (ip, port = 0) => {	<mask> export const getIpList = (interfaces) => Object.values(interfaces) <mask> .reduce((acc, curr) => acc.concat(curr.ip_addresses), []) <mask> .sort(); <mask> <mask> export const getDnsAddress = (ip, port = '') => { <mask> const isStandardDnsPort = port === STANDARD_DNS_PORT; <mask> let address = ip; <mask> <mask> if (port) { <mask> if (ip.includes(':') && !isStandardDnsPort) { </s> Fix some typing problems - Using '' as default value is confusing when the function expects a number as parameter - `validateRequiredValue` can take a number as well as a string as first parameter </s> remove export const getWebAddress = (ip, port = '') => { </s> add export const getWebAddress = (ip, port = 0) => { </s> remove * @param value {string} </s> add * @param value {string\|number}	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d	client/src/helpers/helpers.js
export const getWebAddress = (ip, port = 0) => {	<mask> <mask> return address; <mask> }; <mask> <mask> export const getWebAddress = (ip, port = '') => { <mask> const isStandardWebPort = port === STANDARD_WEB_PORT; <mask> let address = `http://${ip}`; <mask> <mask> if (port && !isStandardWebPort) { <mask> if (ip.includes(':') && !ip.includes('[')) { </s> Fix some typing problems - Using '' as default value is confusing when the function expects a number as parameter - `validateRequiredValue` can take a number as well as a string as first parameter </s> remove export const getDnsAddress = (ip, port = '') => { </s> add export const getDnsAddress = (ip, port = 0) => { </s> remove * @param value {string} </s> add * @param value {string\|number}	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d	client/src/helpers/helpers.js
* @param value {string\|number}	<mask> // Validation functions <mask> // https://redux-form.com/8.3.0/examples/fieldlevelvalidation/ <mask> // If the value is valid, the validation function should return undefined. <mask> /** <mask> * @param value {string} <mask> * @returns {undefined\|string} <mask> */ <mask> export const validateRequiredValue = (value) => { <mask> const formattedValue = typeof value === 'string' ? value.trim() : value; <mask> if (formattedValue \|\| formattedValue === 0 \|\| (formattedValue && formattedValue.length !== 0)) { </s> Fix some typing problems - Using '' as default value is confusing when the function expects a number as parameter - `validateRequiredValue` can take a number as well as a string as first parameter </s> remove export const getWebAddress = (ip, port = '') => { </s> add export const getWebAddress = (ip, port = 0) => { </s> remove export const getDnsAddress = (ip, port = '') => { </s> add export const getDnsAddress = (ip, port = 0) => {	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d	client/src/helpers/validators.js
// Names of services to block (globally). // Per-client settings can override this configuration. BlockedServices []string `yaml:"blocked_services"`	<mask> <mask> Rewrites []RewriteEntry `yaml:"rewrites"` <mask> <mask> // Called when the configuration is changed by HTTP request <mask> ConfigModified func() `yaml:"-"` <mask> <mask> // Register an HTTP handler <mask> HTTPRegister func(string, string, func(http.ResponseWriter, http.Request)) `yaml:"-"` </s> refactor: move blocked-services functions to dnsfilter </s> remove // Names of services to block (globally). // Per-client settings can override this configuration. BlockedServices []string `yaml:"blocked_services"` </s> add </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	dnsfilter/dnsfilter.go
// BlockedServices	<mask> func (d Dnsfilter) WriteDiskConfig(c Config) { <mask> d.confLock.Lock() <mask> c = d.Config <mask> c.Rewrites = rewriteArrayDup(d.Config.Rewrites) <mask> d.confLock.Unlock() <mask> } <mask> <mask> // SetFilters - set new filters (synchronously or asynchronously) <mask> // When filters are set asynchronously, the old filters continue working until the new filters are ready. </s> refactor: move blocked-services functions to dnsfilter </s> remove // Names of services to block (globally). // Per-client settings can override this configuration. BlockedServices []string `yaml:"blocked_services"` </s> add </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) {	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	dnsfilter/dnsfilter.go
bsvcs := []string{} for _, s := range d.BlockedServices { if !BlockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } d.BlockedServices = bsvcs initBlockedServices()	<mask> d.Config = c <mask> d.prepareRewrites() <mask> } <mask> <mask> if blockFilters != nil { <mask> err := d.initFiltering(nil, blockFilters) <mask> if err != nil { <mask> log.Error("Can't initialize filtering subsystem: %s", err) <mask> d.Close() <mask> return nil </s> refactor: move blocked-services functions to dnsfilter </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	dnsfilter/dnsfilter.go
d.registerBlockedServicesHandlers()	<mask> d.registerSecurityHandlers() <mask> d.registerRewritesHandlers() <mask> } <mask> } <mask> <mask> // </s> * refactor: move blocked-services functions to dnsfilter </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove RegisterBlockedServicesHandlers() </s> add	[ "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	dnsfilter/dnsfilter.go
"github.com/AdguardTeam/AdGuardHome/dnsfilter"	<mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/golibs/utils" </s> * refactor: move blocked-services functions to dnsfilter </s> remove "github.com/AdguardTeam/AdGuardHome/util" </s> add </s> remove initServices() </s> add </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/clients.go
if !dnsfilter.BlockedSvcKnown(s) {	<mask> Upstreams: cy.Upstreams, <mask> } <mask> <mask> for _, s := range cy.BlockedServices { <mask> if !blockedSvcKnown(s) { <mask> log.Debug("Clients: skipping unknown blocked-service '%s'", s) <mask> continue <mask> } <mask> cli.BlockedServices = append(cli.BlockedServices, s) <mask> } </s> * refactor: move blocked-services functions to dnsfilter </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/clients.go
	<mask> <mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists <mask> FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours) <mask> DnsfilterConf dnsfilter.Config `yaml:",inline"` <mask> <mask> // Names of services to block (globally). <mask> // Per-client settings can override this configuration. <mask> BlockedServices []string `yaml:"blocked_services"` <mask> } <mask> <mask> type tlsConfigSettings struct { <mask> Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DOT/DOH/HTTPS) status <mask> ServerName string `yaml:"server_name" json:"server_name,omitempty"` // ServerName is the hostname of your HTTPS/TLS server </s> * refactor: move blocked-services functions to dnsfilter </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/config.go
	<mask> log.Error("Couldn't parse config file: %s", err) <mask> return err <mask> } <mask> <mask> bsvcs := []string{} <mask> for _, s := range config.DNS.BlockedServices { <mask> if !blockedSvcKnown(s) { <mask> log.Debug("skipping unknown blocked-service '%s'", s) <mask> continue <mask> } <mask> bsvcs = append(bsvcs, s) <mask> } <mask> config.DNS.BlockedServices = bsvcs <mask> <mask> if !checkFiltersUpdateIntervalHours(config.DNS.FiltersUpdateIntervalHours) { <mask> config.DNS.FiltersUpdateIntervalHours = 24 <mask> } <mask> <mask> status := tlsConfigStatus{} </s> * refactor: move blocked-services functions to dnsfilter </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/config.go
	<mask> "net/url" <mask> "strconv" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/util" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/NYTimes/gziphandler" <mask> ) <mask> </s> * refactor: move blocked-services functions to dnsfilter </s> remove initServices() </s> add </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/control.go
"github.com/AdguardTeam/AdGuardHome/util"	<mask> "strconv" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/NYTimes/gziphandler" <mask> ) <mask> <mask> // ---------------- </s> * refactor: move blocked-services functions to dnsfilter </s> remove "github.com/AdguardTeam/AdGuardHome/util" </s> add </s> remove // Names of services to block (globally). // Per-client settings can override this configuration. BlockedServices []string `yaml:"blocked_services"` </s> add	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/control.go
	<mask> <mask> httpRegister("GET", "/control/profile", handleGetProfile) <mask> <mask> RegisterTLSHandlers() <mask> RegisterBlockedServicesHandlers() <mask> RegisterAuthHandlers() <mask> <mask> http.HandleFunc("/dns-query", postInstall(handleDOH)) <mask> } <mask> </s> * refactor: move blocked-services functions to dnsfilter </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/control.go
Context.dnsFilter.ApplyBlockedServices(&setts, nil, true)	<mask> host := q.Get("name") <mask> <mask> setts := Context.dnsFilter.GetConfig() <mask> setts.FilteringEnabled = true <mask> ApplyBlockedServices(&setts, config.DNS.BlockedServices) <mask> result, err := Context.dnsFilter.CheckHost(host, dns.TypeA, &setts) <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "couldn't apply filtering: %s: %s", host, err) <mask> return <mask> } </s> * refactor: move blocked-services functions to dnsfilter </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/control_filtering.go
Context.dnsFilter.ApplyBlockedServices(setts, nil, true)	<mask> } <mask> <mask> // If a client has his own settings, apply them <mask> func applyAdditionalFiltering(clientAddr string, setts dnsfilter.RequestFilteringSettings) { <mask> ApplyBlockedServices(setts, config.DNS.BlockedServices) <mask> <mask> if len(clientAddr) == 0 { <mask> return <mask> } <mask> </s> refactor: move blocked-services functions to dnsfilter </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) {	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/dns.go
Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)	<mask> <mask> log.Debug("Using settings for client with IP %s", clientAddr) <mask> <mask> if c.UseOwnBlockedServices { <mask> ApplyBlockedServices(setts, c.BlockedServices) <mask> } <mask> <mask> setts.ClientTags = c.Tags <mask> <mask> if !c.UseOwnSettings { </s> * refactor: move blocked-services functions to dnsfilter </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/dns.go
	<mask> requireAdminRights() <mask> } <mask> <mask> initConfig() <mask> initServices() <mask> <mask> Context.tlsRoots = util.LoadSystemRootCAs() <mask> Context.transport = &http.Transport{ <mask> DialContext: customDialContext, <mask> Proxy: getHTTPProxy, </s> * refactor: move blocked-services functions to dnsfilter </s> remove bsvcs := []string{} for _, s := range config.DNS.BlockedServices { if !blockedSvcKnown(s) { log.Debug("skipping unknown blocked-service '%s'", s) continue } bsvcs = append(bsvcs, s) } config.DNS.BlockedServices = bsvcs </s> add </s> remove if !blockedSvcKnown(s) { </s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove ApplyBlockedServices(setts, c.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014	home/home.go
	<mask> log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err) <mask> return Result{}, err <mask> } <mask> <mask> res.IP = addrs[0] <mask> // The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix <mask> for _, i := range addrs { <mask> if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len { <mask> res.IP = ipv4 <mask> break <mask> } </s> - dnsfilter: fix safesearch issue #268 </s> remove if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len { </s> add if ipv4 := i.To4(); ipv4 != nil {	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911	dnsfilter/dnsfilter.go
if ipv4 := i.To4(); ipv4 != nil {	<mask> <mask> res.IP = addrs[0] <mask> // The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix <mask> for _, i := range addrs { <mask> if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len { <mask> res.IP = ipv4 <mask> break <mask> } <mask> } <mask> </s> - dnsfilter: fix safesearch issue #268 </s> remove res.IP = addrs[0] // The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911	dnsfilter/dnsfilter.go
if len(res.IP) == 0 { return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost) }	<mask> break <mask> } <mask> } <mask> <mask> // Cache result <mask> err = safeSearchCache.Set(host, res) <mask> if err != nil { <mask> return Result{}, nil <mask> } <mask> return res, nil </s> - dnsfilter: fix safesearch issue #268 </s> remove if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len { </s> add if ipv4 := i.To4(); ipv4 != nil { </s> remove res.IP = addrs[0] // The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix </s> add	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911	dnsfilter/dnsfilter.go
	<mask> rules: []string{"\|\|twitter.com^", "\|\|twttr.com^", "\|\|t.co^", "\|\|twimg.com^"}, <mask> }, { <mask> name: "youtube", <mask> rules: []string{ <mask> "\|\|youtube.com^", <mask> "\|\|ytimg.com^", <mask> "\|\|youtu.be^", <mask> "\|\|googlevideo.com^", <mask> "\|\|youtubei.googleapis.com^", <mask> "\|\|youtube-nocookie.com^", <mask> "\|\|youtube", <mask> }, </s> Pull request: 4755-youtube-domain Updates #4755. Squashed commit of the following: commit cb0ab8b26f6f277ef76ee3492c99870cbfc24666 Author: Ainar Garipov <[email protected]> Date: Thu Jul 28 17:21:02 2022 +0300 filtering: add another youtube domain </s> remove "\|\|youtubei.googleapis.com^", "\|\|youtube-nocookie.com^", </s> add "\|\|wide-youtube.l.google.com^", "\|\|youtu.be^",	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192	internal/filtering/blocked.go
"\|\|wide-youtube.l.google.com^", "\|\|youtu.be^",	<mask> "\|\|youtube.com^", <mask> "\|\|ytimg.com^", <mask> "\|\|youtu.be^", <mask> "\|\|googlevideo.com^", <mask> "\|\|youtubei.googleapis.com^", <mask> "\|\|youtube-nocookie.com^", <mask> "\|\|youtube", <mask> }, <mask> }, { <mask> name: "twitch", <mask> rules: []string{"\|\|twitch.tv^", "\|\|ttvnw.net^", "\|\|jtvnw.net^", "\|\|twitchcdn.net^"}, </s> Pull request: 4755-youtube-domain Updates #4755. Squashed commit of the following: commit cb0ab8b26f6f277ef76ee3492c99870cbfc24666 Author: Ainar Garipov <[email protected]> Date: Thu Jul 28 17:21:02 2022 +0300 filtering: add another youtube domain </s> remove "\|\|youtube.com^", "\|\|ytimg.com^", "\|\|youtu.be^", </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192	internal/filtering/blocked.go
"\|\|youtube-nocookie.com^", "\|\|youtube.com^", "\|\|youtubei.googleapis.com^", "\|\|ytimg.com^",	<mask> "\|\|wide-youtube.l.google.com^", <mask> "\|\|youtu.be^", <mask> "\|\|youtube", <mask> }, <mask> }, { <mask> name: "twitch", <mask> rules: []string{"\|\|twitch.tv^", "\|\|ttvnw.net^", "\|\|jtvnw.net^", "\|\|twitchcdn.net^"}, <mask> }, { </s> Pull request: 4755-youtube-domain Updates #4755. Squashed commit of the following: commit cb0ab8b26f6f277ef76ee3492c99870cbfc24666 Author: Ainar Garipov <[email protected]> Date: Thu Jul 28 17:21:02 2022 +0300 filtering: add another youtube domain </s> remove "\|\|youtube.com^", "\|\|ytimg.com^", "\|\|youtu.be^", </s> add </s> remove "\|\|youtubei.googleapis.com^", "\|\|youtube-nocookie.com^", </s> add "\|\|wide-youtube.l.google.com^", "\|\|youtu.be^",	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192	internal/filtering/blocked.go
func clientFind(ip string) (*Client, bool) {	<mask> return ok <mask> } <mask> <mask> // Search for a client by IP <mask> func clientFind(ip string) (Client, bool) { <mask> clients.lock.Lock() <mask> defer clients.lock.Unlock() <mask> <mask> c, ok := clients.ipIndex[ip] <mask> if ok { </s> Fix #727 - use default parental sensitivity when it's not set </s> remove return c, true </s> add return c, true </s> remove if !ok \|\| !c.UseOwnSettings { </s> add if !ok \|\| c == nil \|\| !c.UseOwnSettings { </s> remove setts.ParentalEnabled = c.UseOwnSettings </s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove return Client{}, false </s> add return nil, false </s> remove return c, true </s> add return c, true	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	clients.go
return c, true	<mask> defer clients.lock.Unlock() <mask> <mask> c, ok := clients.ipIndex[ip] <mask> if ok { <mask> return c, true <mask> } <mask> <mask> for _, c = range clients.list { <mask> if len(c.MAC) != 0 { <mask> mac, err := net.ParseMAC(c.MAC) </s> Fix #727 - use default parental sensitivity when it's not set </s> remove func clientFind(ip string) (Client, bool) { </s> add func clientFind(ip string) (Client, bool) { </s> remove return *c, true </s> add return c, true </s> remove if !ok \|\| !c.UseOwnSettings { </s> add if !ok \|\| c == nil \|\| !c.UseOwnSettings { </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) </s> add sensitivity := d.ParentalSensitivity if sensitivity == 0 { sensitivity = defaultParentalSensitivity } url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity) </s> remove return Client{}, false </s> add return nil, false	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	clients.go
return c, true	<mask> if ipAddr == nil { <mask> continue <mask> } <mask> if ip == ipAddr.String() { <mask> return c, true <mask> } <mask> } <mask> } <mask> <mask> return Client{}, false </s> Fix #727 - use default parental sensitivity when it's not set </s> remove return Client{}, false </s> add return nil, false </s> remove return c, true </s> add return c, true </s> remove if !ok \|\| !c.UseOwnSettings { </s> add if !ok \|\| c == nil \|\| !c.UseOwnSettings { </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) </s> add sensitivity := d.ParentalSensitivity if sensitivity == 0 { sensitivity = defaultParentalSensitivity } url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity) </s> remove func clientFind(ip string) (Client, bool) { </s> add func clientFind(ip string) (*Client, bool) {	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	clients.go
return nil, false	<mask> } <mask> } <mask> } <mask> <mask> return Client{}, false <mask> } <mask> <mask> // Check if Client object's fields are correct <mask> func clientCheck(c Client) error { <mask> if len(c.Name) == 0 { </s> Fix #727 - use default parental sensitivity when it's not set </s> remove return c, true </s> add return c, true </s> remove go l.flushLogBuffer(false) </s> add go l.flushLogBuffer(false) // nolint </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) </s> add sensitivity := d.ParentalSensitivity if sensitivity == 0 { sensitivity = defaultParentalSensitivity } url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity) </s> remove return *c, true </s> add return c, true </s> remove setts.ParentalEnabled = c.UseOwnSettings </s> add setts.ParentalEnabled = c.ParentalEnabled	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	clients.go
if !ok \|\| c == nil \|\| !c.UseOwnSettings {	<mask> <mask> // If a client has his own settings, apply them <mask> func applyClientSettings(clientAddr string, setts dnsfilter.RequestFilteringSettings) { <mask> c, ok := clientFind(clientAddr) <mask> if !ok \|\| !c.UseOwnSettings { <mask> return <mask> } <mask> <mask> log.Debug("Using settings for client with IP %s", clientAddr) <mask> setts.FilteringEnabled = c.FilteringEnabled </s> Fix #727 - use default parental sensitivity when it's not set </s> remove setts.ParentalEnabled = c.UseOwnSettings </s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove func clientFind(ip string) (Client, bool) { </s> add func clientFind(ip string) (Client, bool) { </s> remove return *c, true </s> add return c, true </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) </s> add sensitivity := d.ParentalSensitivity if sensitivity == 0 { sensitivity = defaultParentalSensitivity } url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity) </s> remove return Client{}, false </s> add return nil, false	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	dns.go
setts.ParentalEnabled = c.ParentalEnabled	<mask> log.Debug("Using settings for client with IP %s", clientAddr) <mask> setts.FilteringEnabled = c.FilteringEnabled <mask> setts.SafeSearchEnabled = c.SafeSearchEnabled <mask> setts.SafeBrowsingEnabled = c.SafeBrowsingEnabled <mask> setts.ParentalEnabled = c.UseOwnSettings <mask> } <mask> <mask> func startDNSServer() error { <mask> if isRunning() { <mask> return fmt.Errorf("unable to start forwarding DNS server: Already running") </s> Fix #727 - use default parental sensitivity when it's not set </s> remove if !ok \|\| !c.UseOwnSettings { </s> add if !ok \|\| c == nil \|\| !c.UseOwnSettings { </s> remove go l.flushLogBuffer(false) </s> add go l.flushLogBuffer(false) // nolint </s> remove return c, true </s> add return c, true </s> remove func clientFind(ip string) (Client, bool) { </s> add func clientFind(ip string) (Client, bool) { </s> remove return Client{}, false </s> add return nil, false	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	dns.go
const defaultParentalSensitivity = 13 // use "TEEN" by default const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control	<mask> const defaultSafebrowsingServer = "sb.adtidy.org" <mask> const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s" <mask> const defaultParentalServer = "pctrl.adguard.com" <mask> const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d" <mask> const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control <mask> <mask> // Custom filtering settings <mask> type RequestFilteringSettings struct { <mask> FilteringEnabled bool <mask> SafeSearchEnabled bool </s> Fix #727 - use default parental sensitivity when it's not set </s> remove setts.ParentalEnabled = c.UseOwnSettings </s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove if !ok \|\| !c.UseOwnSettings { </s> add if !ok \|\| c == nil \|\| !c.UseOwnSettings { </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) </s> add sensitivity := d.ParentalSensitivity if sensitivity == 0 { sensitivity = defaultParentalSensitivity } url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity) </s> remove return c, true </s> add return c, true </s> remove func clientFind(ip string) (Client, bool) { </s> add func clientFind(ip string) (Client, bool) {	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	dnsfilter/dnsfilter.go
sensitivity := d.ParentalSensitivity if sensitivity == 0 { sensitivity = defaultParentalSensitivity } url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity)	<mask> schema := "https" <mask> if d.UsePlainHTTP { <mask> schema = "http" <mask> } <mask> url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) <mask> return url <mask> } <mask> handleBody := func(body []byte, hashes map[string]bool) (Result, error) { <mask> // parse json <mask> var m []struct { </s> Fix #727 - use default parental sensitivity when it's not set </s> remove return c, true </s> add return c, true </s> remove return Client{}, false </s> add return nil, false </s> remove func clientFind(ip string) (Client, bool) { </s> add func clientFind(ip string) (Client, bool) { </s> remove return *c, true </s> add return c, true </s> remove if !ok \|\| !c.UseOwnSettings { </s> add if !ok \|\| c == nil \|\| !c.UseOwnSettings {	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	dnsfilter/dnsfilter.go
go l.flushLogBuffer(false) // nolint	<mask> // if buffer needs to be flushed to disk, do it now <mask> if needFlush { <mask> // write to file <mask> // do it in separate goroutine -- we are stalling DNS response this whole time <mask> go l.flushLogBuffer(false) <mask> } <mask> <mask> return &entry <mask> } <mask> </s> Fix #727 - use default parental sensitivity when it's not set </s> remove setts.ParentalEnabled = c.UseOwnSettings </s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove return Client{}, false </s> add return nil, false </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) </s> add sensitivity := d.ParentalSensitivity if sensitivity == 0 { sensitivity = defaultParentalSensitivity } url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity) </s> remove return c, true </s> add return c, true </s> remove func clientFind(ip string) (Client, bool) { </s> add func clientFind(ip string) (Client, bool) {	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383	dnsforward/querylog.go
	<mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d) <mask> case dnsfilter.FilteredParental: <mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d) <mask> default: <mask> if result.IP != nil { <mask> return s.genResponseWithIP(m, result.IP) <mask> } <mask> <mask> if s.conf.BlockingMode == "null_ip" { <mask> switch m.Question[0].Qtype { <mask> case dns.TypeA: <mask> return s.genARecord(m, []byte{0, 0, 0, 0}) <mask> case dns.TypeAAAA: </s> * DNS: nxdomain: don't return IP address for a blocked domain Don't return IP address for a blocked domain when blocking mode is "nxdomain". </s> remove if !(bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") { </s> add if !(bm == "default" \|\| bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") {	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d	dnsforward/dnsforward.go
} else if s.conf.BlockingMode == "nxdomain" { return s.genNXDomain(m)	<mask> return s.genAAAARecord(m, s.conf.BlockingIPAddrv6) <mask> } <mask> } <mask> <mask> if result.IP != nil { <mask> return s.genResponseWithIP(m, result.IP) <mask> } <mask> return s.genNXDomain(m) </s> * DNS: nxdomain: don't return IP address for a blocked domain Don't return IP address for a blocked domain when blocking mode is "nxdomain". </s> remove if result.IP != nil { return s.genResponseWithIP(m, result.IP) } </s> add </s> remove if !(bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") { </s> add if !(bm == "default" \|\| bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") {	[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d	dnsforward/dnsforward.go
if result.IP != nil { return s.genResponseWithIP(m, result.IP) }	<mask> } else if s.conf.BlockingMode == "nxdomain" { <mask> return s.genNXDomain(m) <mask> } <mask> <mask> return s.genNXDomain(m) <mask> } <mask> } <mask> </s> * DNS: nxdomain: don't return IP address for a blocked domain Don't return IP address for a blocked domain when blocking mode is "nxdomain". </s> remove if !(bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") { </s> add if !(bm == "default" \|\| bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") { </s> remove if result.IP != nil { return s.genResponseWithIP(m, result.IP) } </s> add	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d	dnsforward/dnsforward.go
if !(bm == "default" \|\| bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") {	<mask> } <mask> <mask> func checkBlockingMode(req dnsConfigJSON) bool { <mask> bm := req.BlockingMode <mask> if !(bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") { <mask> return false <mask> } <mask> <mask> if bm == "custom_ip" { <mask> ip := net.ParseIP(req.BlockingIPv4) </s> * DNS: nxdomain: don't return IP address for a blocked domain Don't return IP address for a blocked domain when blocking mode is "nxdomain". </s> remove if result.IP != nil { return s.genResponseWithIP(m, result.IP) } </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d	dnsforward/dnsforward_http.go
- "default"	<mask> blocking_mode: <mask> type: "string" <mask> enum: <mask> - "nxdomain" <mask> - "null_ip" <mask> - "custom_ip" <mask> blocking_ipv4: <mask> type: "string" <mask> blocking_ipv6: </s> * DNS: nxdomain: don't return IP address for a blocked domain Don't return IP address for a blocked domain when blocking mode is "nxdomain". </s> remove if !(bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") { </s> add if !(bm == "default" \|\| bm == "nxdomain" \|\| bm == "null_ip" \|\| bm == "custom_ip") { </s> remove if result.IP != nil { return s.genResponseWithIP(m, result.IP) } </s> add	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d	openapi/openapi.yaml
BlockingMode: "nxdomain", // mode how to answer filtered requests	<mask> Port: 53, <mask> FilteringConfig: dnsforward.FilteringConfig{ <mask> ProtectionEnabled: true, // whether or not use any of dnsfilter features <mask> FilteringEnabled: true, // whether or not use filter lists <mask> BlockedResponseTTL: 10, // in seconds <mask> QueryLogEnabled: true, <mask> Ratelimit: 20, <mask> RefuseAny: true, </s> * dnsforward, config: add unspecified IP blocking option * dnsforward: prioritize host files over null filter * dnsforward, config: adjust setting variable to blocking_mode * dnsforward: use net.IPv4zero for null IP	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3	config.go
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests	<mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features <mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists <mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600) <mask> QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled <mask> Ratelimit int `yaml:"ratelimit"` // max number of requests per second from a given IP (0 to disable) <mask> RatelimitWhitelist []string `yaml:"ratelimit_whitelist"` // a list of whitelisted client IP addresses <mask> RefuseAny bool `yaml:"refuse_any"` // if true, refuse ANY requests <mask> BootstrapDNS []string `yaml:"bootstrap_dns"` // a list of bootstrap DNS for DoH and DoT (plain DNS only) </s> * dnsforward, config: add unspecified IP blocking option * dnsforward: prioritize host files over null filter * dnsforward, config: adjust setting variable to blocking_mode * dnsforward: use net.IPv4zero for null IP	[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3	dnsforward/dnsforward.go
if s.BlockingMode == "null_ip" { return s.genARecord(m, net.IPv4zero) }	<mask> return s.genARecord(m, result.IP) <mask> } <mask> <mask> return s.genNXDomain(m) <mask> } <mask> } <mask> <mask> func (s Server) genServerFailure(request dns.Msg) dns.Msg { </s> dnsforward, config: add unspecified IP blocking option * dnsforward: prioritize host files over null filter * dnsforward, config: adjust setting variable to blocking_mode * dnsforward: use net.IPv4zero for null IP	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3	dnsforward/dnsforward.go
github.com/AdguardTeam/dnsproxy v0.9.11	<mask> module github.com/AdguardTeam/AdGuardHome <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.9.10 <mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect <mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7 <mask> github.com/go-ole/go-ole v1.2.1 // indirect <mask> github.com/go-test/deep v1.0.1 <mask> github.com/gobuffalo/packr v1.19.0 </s> go.mod -- update dnsproxy to v0.9.11 and it's dependencies </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 </s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 h1:q364WlTvC+CS8kJbMy7TCyt4Niqixxw584MQJtCGhJU= github.com/AdguardTeam/dnsproxy v0.9.10/go.mod h1:IqBhopgNpzB168kMurbjXf86dn50geasBIuGVxY63j0= </s> add github.com/AdguardTeam/dnsproxy v0.9.11 h1:1rsXJTHUqwxTLaGMUD2NrzHw2j88Nk9EhTX6EgmdVlM= github.com/AdguardTeam/dnsproxy v0.9.11/go.mod h1:JAmwpTphfUBBw6TIOFGxL49/oSl+J97kaRW8viqXNe8= </s> remove golang.org/x/net v0.0.0-20181220203305-927f97764cc3 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e golang.org/x/sys v0.0.0-20190122071731-054c452bb702 </s> remove github.com/ameshkov/dnscrypt v1.0.4 h1:vtwHm5m4R2dhcCx23wiI+gNBoy7qm4h7+kZ4Pucw/vE= github.com/ameshkov/dnscrypt v1.0.4/go.mod h1:hVW52S6r0QvUpIwsyfZ1ifYYpfGu5pewD3pl7afMJcQ= </s> add github.com/ameshkov/dnscrypt v1.0.6 h1:55wfnNF8c4E3JXDNlwPl2Pbs7UPPIh+kI6KK3THqYS0= github.com/ameshkov/dnscrypt v1.0.6/go.mod h1:ZvT9LaNaJfDNXKIbkYFf24HUgHuQR6MNT6nwVvN4jMQ= </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 h1:FMAReGTEDNr4AdbScv/PqzjMQUpkkVHiF/t8sDHQQVQ= github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= </s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 h1:yyDtaSMcAZdm1I6uL8YLghpWiJljfBHs8NC/P86PYQk= github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM=	[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e	go.mod
github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24	<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7 <mask> github.com/go-ole/go-ole v1.2.1 // indirect <mask> github.com/go-test/deep v1.0.1 <mask> github.com/gobuffalo/packr v1.19.0 <mask> github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 <mask> github.com/joomcode/errorx v0.1.0 <mask> github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect <mask> github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b <mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414 <mask> github.com/miekg/dns v1.1.1 </s> go.mod -- update dnsproxy to v0.9.11 and it's dependencies </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 </s> add github.com/AdguardTeam/dnsproxy v0.9.11 </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 h1:FMAReGTEDNr4AdbScv/PqzjMQUpkkVHiF/t8sDHQQVQ= github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= </s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 h1:yyDtaSMcAZdm1I6uL8YLghpWiJljfBHs8NC/P86PYQk= github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= </s> remove golang.org/x/net v0.0.0-20181220203305-927f97764cc3 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e golang.org/x/sys v0.0.0-20190122071731-054c452bb702 </s> remove github.com/ameshkov/dnscrypt v1.0.4 h1:vtwHm5m4R2dhcCx23wiI+gNBoy7qm4h7+kZ4Pucw/vE= github.com/ameshkov/dnscrypt v1.0.4/go.mod h1:hVW52S6r0QvUpIwsyfZ1ifYYpfGu5pewD3pl7afMJcQ= </s> add github.com/ameshkov/dnscrypt v1.0.6 h1:55wfnNF8c4E3JXDNlwPl2Pbs7UPPIh+kI6KK3THqYS0= github.com/ameshkov/dnscrypt v1.0.6/go.mod h1:ZvT9LaNaJfDNXKIbkYFf24HUgHuQR6MNT6nwVvN4jMQ= </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM= golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> add golang.org/x/sys v0.0.0-20190122071731-054c452bb702 h1:Lk4tbZFnlyPgV+sLgTw5yGfzrlOn9kx4vSombi2FFlY= golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e	go.mod
golang.org/x/net v0.0.0-20190119204137-ed066c81e75e golang.org/x/sys v0.0.0-20190122071731-054c452bb702	<mask> github.com/shirou/gopsutil v2.18.10+incompatible <mask> github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect <mask> github.com/stretchr/testify v1.2.2 <mask> go.uber.org/goleak v0.10.0 <mask> golang.org/x/net v0.0.0-20181220203305-927f97764cc3 <mask> golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb <mask> gopkg.in/asaskevich/govalidator.v4 v4.0.0-20160518190739-766470278477 <mask> gopkg.in/yaml.v2 v2.2.1 <mask> ) </s> go.mod -- update dnsproxy to v0.9.11 and it's dependencies </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM= golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> add golang.org/x/sys v0.0.0-20190122071731-054c452bb702 h1:Lk4tbZFnlyPgV+sLgTw5yGfzrlOn9kx4vSombi2FFlY= golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> remove golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 h1:gT0Y6H7hbVPUtvtk0YGxMXPgN+p8fYlqWkgJeUCZcaQ= golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q= golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 </s> add github.com/AdguardTeam/dnsproxy v0.9.11 </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 </s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e	go.mod
github.com/AdguardTeam/dnsproxy v0.9.11 h1:1rsXJTHUqwxTLaGMUD2NrzHw2j88Nk9EhTX6EgmdVlM= github.com/AdguardTeam/dnsproxy v0.9.11/go.mod h1:JAmwpTphfUBBw6TIOFGxL49/oSl+J97kaRW8viqXNe8=	<mask> github.com/AdguardTeam/dnsproxy v0.9.10 h1:q364WlTvC+CS8kJbMy7TCyt4Niqixxw584MQJtCGhJU= <mask> github.com/AdguardTeam/dnsproxy v0.9.10/go.mod h1:IqBhopgNpzB168kMurbjXf86dn50geasBIuGVxY63j0= <mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY= <mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw= </s> go.mod -- update dnsproxy to v0.9.11 and it's dependencies </s> remove github.com/ameshkov/dnscrypt v1.0.4 h1:vtwHm5m4R2dhcCx23wiI+gNBoy7qm4h7+kZ4Pucw/vE= github.com/ameshkov/dnscrypt v1.0.4/go.mod h1:hVW52S6r0QvUpIwsyfZ1ifYYpfGu5pewD3pl7afMJcQ= </s> add github.com/ameshkov/dnscrypt v1.0.6 h1:55wfnNF8c4E3JXDNlwPl2Pbs7UPPIh+kI6KK3THqYS0= github.com/ameshkov/dnscrypt v1.0.6/go.mod h1:ZvT9LaNaJfDNXKIbkYFf24HUgHuQR6MNT6nwVvN4jMQ= </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 </s> add github.com/AdguardTeam/dnsproxy v0.9.11 </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM= golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> add golang.org/x/sys v0.0.0-20190122071731-054c452bb702 h1:Lk4tbZFnlyPgV+sLgTw5yGfzrlOn9kx4vSombi2FFlY= golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> remove golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 h1:gT0Y6H7hbVPUtvtk0YGxMXPgN+p8fYlqWkgJeUCZcaQ= golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q= golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=	[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e	go.sum
github.com/ameshkov/dnscrypt v1.0.6 h1:55wfnNF8c4E3JXDNlwPl2Pbs7UPPIh+kI6KK3THqYS0= github.com/ameshkov/dnscrypt v1.0.6/go.mod h1:ZvT9LaNaJfDNXKIbkYFf24HUgHuQR6MNT6nwVvN4jMQ=	<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us= <mask> github.com/ameshkov/dnscrypt v1.0.4 h1:vtwHm5m4R2dhcCx23wiI+gNBoy7qm4h7+kZ4Pucw/vE= <mask> github.com/ameshkov/dnscrypt v1.0.4/go.mod h1:hVW52S6r0QvUpIwsyfZ1ifYYpfGu5pewD3pl7afMJcQ= <mask> github.com/ameshkov/dnsstamps v1.0.1 h1:LhGvgWDzhNJh+kBQd/AfUlq1vfVe109huiXw4JhnPug= <mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= <mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I= <mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= <mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7 h1:NpQ+gkFOH27AyDypSCJ/LdsIi/b4rdnEb1N5+IpFfYs= </s> go.mod -- update dnsproxy to v0.9.11 and it's dependencies </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 h1:q364WlTvC+CS8kJbMy7TCyt4Niqixxw584MQJtCGhJU= github.com/AdguardTeam/dnsproxy v0.9.10/go.mod h1:IqBhopgNpzB168kMurbjXf86dn50geasBIuGVxY63j0= </s> add github.com/AdguardTeam/dnsproxy v0.9.11 h1:1rsXJTHUqwxTLaGMUD2NrzHw2j88Nk9EhTX6EgmdVlM= github.com/AdguardTeam/dnsproxy v0.9.11/go.mod h1:JAmwpTphfUBBw6TIOFGxL49/oSl+J97kaRW8viqXNe8= </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 </s> add github.com/AdguardTeam/dnsproxy v0.9.11 </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 </s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM= golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> add golang.org/x/sys v0.0.0-20190122071731-054c452bb702 h1:Lk4tbZFnlyPgV+sLgTw5yGfzrlOn9kx4vSombi2FFlY= golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> remove golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 h1:gT0Y6H7hbVPUtvtk0YGxMXPgN+p8fYlqWkgJeUCZcaQ= golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q= golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e	go.sum
github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 h1:yyDtaSMcAZdm1I6uL8YLghpWiJljfBHs8NC/P86PYQk= github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM=	<mask> github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264 h1:roWyi0eEdiFreSqW9V1wT9pNOVzrpo2NWsxja53slX0= <mask> github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= <mask> github.com/gobuffalo/packr v1.19.0 h1:3UDmBDxesCOPF8iZdMDBBWKfkBoYujIMIZePnobqIUI= <mask> github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU= <mask> github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 h1:FMAReGTEDNr4AdbScv/PqzjMQUpkkVHiF/t8sDHQQVQ= <mask> github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= <mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= <mask> github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= <mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= <mask> github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff h1:6NvhExg4omUC9NfA+l4Oq3ibNNeJUdiAF3iBVB0PlDk= <mask> github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff/go.mod h1:ddfPX8Z28YMjiqoaJhNBzWHapTHXejnB5cDCUWDwriw= </s> go.mod -- update dnsproxy to v0.9.11 and it's dependencies </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 </s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 </s> add github.com/AdguardTeam/dnsproxy v0.9.11 </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM= golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> add golang.org/x/sys v0.0.0-20190122071731-054c452bb702 h1:Lk4tbZFnlyPgV+sLgTw5yGfzrlOn9kx4vSombi2FFlY= golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> remove golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 h1:gT0Y6H7hbVPUtvtk0YGxMXPgN+p8fYlqWkgJeUCZcaQ= golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q= golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e	go.sum
golang.org/x/crypto v0.0.0-20190122013713-64072686203f h1:u1CmMhe3a44hy8VIgpInORnI01UVaUYheqR7x9BxT3c= golang.org/x/crypto v0.0.0-20190122013713-64072686203f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=	<mask> go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI= <mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= <mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= <mask> golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= <mask> golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q= <mask> golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= <mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= <mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= </s> go.mod -- update dnsproxy to v0.9.11 and it's dependencies </s> remove golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 h1:gT0Y6H7hbVPUtvtk0YGxMXPgN+p8fYlqWkgJeUCZcaQ= golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q= golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM= golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> add golang.org/x/sys v0.0.0-20190122071731-054c452bb702 h1:Lk4tbZFnlyPgV+sLgTw5yGfzrlOn9kx4vSombi2FFlY= golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> remove golang.org/x/net v0.0.0-20181220203305-927f97764cc3 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb </s> add golang.org/x/net v0.0.0-20190119204137-ed066c81e75e golang.org/x/sys v0.0.0-20190122071731-054c452bb702 </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 h1:FMAReGTEDNr4AdbScv/PqzjMQUpkkVHiF/t8sDHQQVQ= github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= </s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 h1:yyDtaSMcAZdm1I6uL8YLghpWiJljfBHs8NC/P86PYQk= github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= </s> remove github.com/ameshkov/dnscrypt v1.0.4 h1:vtwHm5m4R2dhcCx23wiI+gNBoy7qm4h7+kZ4Pucw/vE= github.com/ameshkov/dnscrypt v1.0.4/go.mod h1:hVW52S6r0QvUpIwsyfZ1ifYYpfGu5pewD3pl7afMJcQ= </s> add github.com/ameshkov/dnscrypt v1.0.6 h1:55wfnNF8c4E3JXDNlwPl2Pbs7UPPIh+kI6KK3THqYS0= github.com/ameshkov/dnscrypt v1.0.6/go.mod h1:ZvT9LaNaJfDNXKIbkYFf24HUgHuQR6MNT6nwVvN4jMQ=	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e	go.sum