Merge branch 'master' into features/rfc8914-ede

author tcarpay <tom@nlnetlabs.nl>

Fri, 20 Aug 2021 14:28:27 +0000 (16:28 +0200)

committer tcarpay <tom@nlnetlabs.nl>

Fri, 20 Aug 2021 14:28:27 +0000 (16:28 +0200)
author tcarpay <tom@nlnetlabs.nl>
Fri, 20 Aug 2021 14:28:27 +0000 (16:28 +0200)
committer tcarpay <tom@nlnetlabs.nl>
Fri, 20 Aug 2021 14:28:27 +0000 (16:28 +0200)
diff --cc daemon/worker.c
Simple merge
diff --cc services/localzone.c
Simple merge
diff --cc services/mesh.c
Simple merge
diff --cc sldns/rrdef.h
Simple merge
diff --cc util/data/msgreply.c
Simple merge
author	tcarpay <tom@nlnetlabs.nl>
	Fri, 20 Aug 2021 14:28:27 +0000 (16:28 +0200)
committer	tcarpay <tom@nlnetlabs.nl>
	Fri, 20 Aug 2021 14:28:27 +0000 (16:28 +0200)
		1	2
daemon/worker.c	patch \|	diff1 \|	diff2 \|	blob \| history
services/localzone.c	patch \|	diff1 \|	diff2 \|	blob \| history
services/mesh.c	patch \|	diff1 \|	diff2 \|	blob \| history
sldns/rrdef.h	patch \|	diff1 \|	diff2 \|	blob \| history
util/data/msgreply.c	patch \|	diff1 \|	diff2 \|	blob \| history