Merge branch 'master' into dnsoverquic

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

Tue, 5 Sep 2023 06:36:33 +0000 (08:36 +0200)

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

Tue, 5 Sep 2023 06:36:33 +0000 (08:36 +0200)
author W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Tue, 5 Sep 2023 06:36:33 +0000 (08:36 +0200)
committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Tue, 5 Sep 2023 06:36:33 +0000 (08:36 +0200)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Tue, 5 Sep 2023 06:36:33 +0000 (08:36 +0200)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Tue, 5 Sep 2023 06:36:33 +0000 (08:36 +0200)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history