Merge branch 'master' into xfr-tsig

author W.C.A. Wijngaards <wouter@nlnetlabs.nl>

Fri, 11 Jul 2025 13:27:40 +0000 (15:27 +0200)

committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>

Fri, 11 Jul 2025 13:27:40 +0000 (15:27 +0200)
author W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Fri, 11 Jul 2025 13:27:40 +0000 (15:27 +0200)
committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Fri, 11 Jul 2025 13:27:40 +0000 (15:27 +0200)
diff --cc configure
Simple merge
diff --cc doc/example.conf.in
Simple merge
diff --cc doc/unbound.conf.rst
Simple merge
author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Fri, 11 Jul 2025 13:27:40 +0000 (15:27 +0200)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Fri, 11 Jul 2025 13:27:40 +0000 (15:27 +0200)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
doc/example.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/unbound.conf.rst	patch \|	diff1 \|	diff2 \|	blob \| history