Merge branch 'master' into xfr-tsig

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

Tue, 19 Aug 2025 13:27:43 +0000 (15:27 +0200)

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

Tue, 19 Aug 2025 13:27:43 +0000 (15:27 +0200)
author W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Tue, 19 Aug 2025 13:27:43 +0000 (15:27 +0200)
committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Tue, 19 Aug 2025 13:27:43 +0000 (15:27 +0200)
diff --cc Makefile.in
Simple merge
diff --cc daemon/remote.c
Simple merge
diff --cc util/data/dname.c
Simple merge
author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Tue, 19 Aug 2025 13:27:43 +0000 (15:27 +0200)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Tue, 19 Aug 2025 13:27:43 +0000 (15:27 +0200)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/remote.c	patch \|	diff1 \|	diff2 \|	blob \| history
util/data/dname.c	patch \|	diff1 \|	diff2 \|	blob \| history