Pull request: all: upd dep

Merge in DNS/adguard-home from 6204-dnsrewrite-important to master

Squashed commit of the following:

commit 379a1c4f3ec3784bc88a3250623e9f4852ef4cb2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:09:00 2023 +0300

    all: upd dep

commit 40485f9b791a22218bae76b0aa6cb8d87173ccb2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:07:58 2023 +0300

    all: upd dep

commit 8c09fe9d937be2c603c9632907edbcde60dd6680
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:04:25 2023 +0300

    docs: changelog

commit 33451738f5dd4b16bbba73bfe1cb495cb976abf9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:01:27 2023 +0300

    docs: changelog

commit cc94b4232c2990234d0bdfc510af58aef10d61a5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:00:58 2023 +0300

    docs: changelog

commit adea5117cb0ca820556a8f00aafb8fd56f471e24
Merge: b90197e87 c0588146e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 13:58:13 2023 +0300

    Merge remote-tracking branch 'origin/master' into 6204-dnsrewrite-important

commit b90197e871e238404a27f43f51b12248a8cff79e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 11:21:05 2023 +0300

    all: upd dep
This commit is contained in:
Dimitry Kolyshev
2023-10-25 14:36:54 +03:00
parent c0588146e7
commit 2a56c78f26
3 changed files with 9 additions and 9 deletions

7
go.mod
View File

@@ -5,7 +5,7 @@ go 1.20
require (
github.com/AdguardTeam/dnsproxy v0.56.2
github.com/AdguardTeam/golibs v0.17.2
github.com/AdguardTeam/urlfilter v0.17.0
github.com/AdguardTeam/urlfilter v0.17.3
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.7
github.com/bluele/gcache v0.0.2
@@ -27,7 +27,7 @@ require (
// own code for that. Perhaps, use gopacket.
github.com/mdlayher/raw v0.1.0
github.com/miekg/dns v1.1.56
github.com/quic-go/quic-go v0.39.1
github.com/quic-go/quic-go v0.39.2
github.com/stretchr/testify v1.8.4
github.com/ti-mo/netfilter v0.5.1
go.etcd.io/bbolt v1.3.7
@@ -63,6 +63,3 @@ require (
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
)
// TODO(a.garipov): Remove once a patched version is released.
replace github.com/quic-go/quic-go => github.com/quic-go/quic-go v0.39.1-0.20231024111439-6dbe30ababfe