Merge remote-tracking branch 'origin/stable' into v2

This commit is contained in:
9seconds
2026-02-28 14:52:05 +01:00
+12 -2
View File
@@ -136,8 +136,18 @@ allow-fallback-on-unknown-dc = false
# By default we use Cloudflare.
#
# DEPRECATED option:
# If dns option is specified, it will be used instead
doh-ip = "1.1.1.1"
# If dns option is specified, it will be used instead. No default is defined
# anymore. But if you set this option, this is literally the same providing
# https:// URL to `dns`.
#
# In other words:
#
# doh-ip = "1.1.1.1"
#
# is literally the same as
#
# dns = "https://1.1.1.1"
# doh-ip = "1.1.1.1"
# Starting from mtg v2.1.12 we have changed a configuration for DNS. Now it
# supports DNS-over-HTTPS, DNS-over-TLS, custom UDP resolver and system