Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 6352-safesearch-cname
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
Mizzick committed Dec 11, 2023
2 parents 2b1c1ea + 7b5cce5 commit 2d2c174
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ NOTE: Add new changes BELOW THIS COMMENT.

- Omitted CNAME records in safe search results, which can cause YouTube to not
work on iOS ([#6352]).
- Incorrect handling of IPv4-in-IPv6 addresses when binding to an unspecified
address on some machines ([#6510]).

[#6352]: https://github.com/AdguardTeam/AdGuardHome/issues/6352
[#6510]: https://github.com/AdguardTeam/AdGuardHome/issues/6510

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module github.com/AdguardTeam/AdGuardHome
go 1.20

require (
github.com/AdguardTeam/dnsproxy v0.60.0
// TODO(a.garipov): Update to a tag when released.
github.com/AdguardTeam/dnsproxy v0.60.1-0.20231208162350-afd2d3e77dd2
github.com/AdguardTeam/golibs v0.18.0
github.com/AdguardTeam/urlfilter v0.17.3
github.com/NYTimes/gziphandler v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/AdguardTeam/dnsproxy v0.60.0 h1:0gLYoFyWRhQ1MP6g6AqqZXL5/h2QM4FE1aybUZ5HGuE=
github.com/AdguardTeam/dnsproxy v0.60.0/go.mod h1:B7FvvTFQZBfey1cJXQo732EyCLX6xj4JqrciCawATzg=
github.com/AdguardTeam/dnsproxy v0.60.1-0.20231208162350-afd2d3e77dd2 h1:7RiKfmX4G5tNvCUJkfrZhPDdPe8MiEPsLK3o+WHscRs=
github.com/AdguardTeam/dnsproxy v0.60.1-0.20231208162350-afd2d3e77dd2/go.mod h1:B7FvvTFQZBfey1cJXQo732EyCLX6xj4JqrciCawATzg=
github.com/AdguardTeam/golibs v0.18.0 h1:ckS2YK7t2Ub6UkXl0fnreVaM15Zb07Hh1gmFqttjpWg=
github.com/AdguardTeam/golibs v0.18.0/go.mod h1:DKhCIXHcUYtBhU8ibTLKh1paUL96n5zhQBlx763sj+U=
github.com/AdguardTeam/urlfilter v0.17.3 h1:fg/ObbnO0Cv6aw0tW6N/ETDMhhNvmcUUOZ7HlmKC3rw=
Expand Down

0 comments on commit 2d2c174

Please sign in to comment.