Merge branch 'master' of github.com:NLnetLabs/unbound into features/ede-caching

author TCY16 <tom@nlnetlabs.nl>

Mon, 21 Nov 2022 10:34:36 +0000 (11:34 +0100)

committer TCY16 <tom@nlnetlabs.nl>

Mon, 21 Nov 2022 10:34:36 +0000 (11:34 +0100)
author TCY16 <tom@nlnetlabs.nl>
Mon, 21 Nov 2022 10:34:36 +0000 (11:34 +0100)
committer TCY16 <tom@nlnetlabs.nl>
Mon, 21 Nov 2022 10:34:36 +0000 (11:34 +0100)
diff --cc daemon/worker.c
Simple merge
diff --cc iterator/iterator.c
Simple merge
diff --cc services/cache/dns.c
Simple merge
diff --cc services/rpz.c
Simple merge
author	TCY16 <tom@nlnetlabs.nl>
	Mon, 21 Nov 2022 10:34:36 +0000 (11:34 +0100)
committer	TCY16 <tom@nlnetlabs.nl>
	Mon, 21 Nov 2022 10:34:36 +0000 (11:34 +0100)
		1	2
daemon/worker.c	patch \|	diff1 \|	diff2 \|	blob \| history
iterator/iterator.c	patch \|	diff1 \|	diff2 \|	blob \| history
services/cache/dns.c	patch \|	diff1 \|	diff2 \|	blob \| history
services/rpz.c	patch \|	diff1 \|	diff2 \|	blob \| history