Merge branch 'develop' into features/rfc-6891-individual-edns-option-parsing

author Willem Toorop <willem@nlnetlabs.nl>

Tue, 12 Jul 2022 13:30:49 +0000 (15:30 +0200)

committer Willem Toorop <willem@nlnetlabs.nl>

Tue, 12 Jul 2022 13:30:49 +0000 (15:30 +0200)
author Willem Toorop <willem@nlnetlabs.nl>
Tue, 12 Jul 2022 13:30:49 +0000 (15:30 +0200)
committer Willem Toorop <willem@nlnetlabs.nl>
Tue, 12 Jul 2022 13:30:49 +0000 (15:30 +0200)
diff --cc .gitignore
Simple merge
diff --cc Makefile.in
Simple merge
diff --cc host2str.c
Simple merge
diff --cc rr.c
Simple merge
author	Willem Toorop <willem@nlnetlabs.nl>
	Tue, 12 Jul 2022 13:30:49 +0000 (15:30 +0200)
committer	Willem Toorop <willem@nlnetlabs.nl>
	Tue, 12 Jul 2022 13:30:49 +0000 (15:30 +0200)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
host2str.c	patch \|	diff1 \|	diff2 \|	blob \| history
rr.c	patch \|	diff1 \|	diff2 \|	blob \| history