Merge branch 'master' of git://github.com/k9982874/unbound into k9982874-master

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

Tue, 18 Jun 2019 11:52:52 +0000 (13:52 +0200)

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

Tue, 18 Jun 2019 11:52:52 +0000 (13:52 +0200)
author W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Tue, 18 Jun 2019 11:52:52 +0000 (13:52 +0200)
committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Tue, 18 Jun 2019 11:52:52 +0000 (13:52 +0200)
diff --cc config.h.in
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc doc/example.conf.in
Simple merge
author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Tue, 18 Jun 2019 11:52:52 +0000 (13:52 +0200)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Tue, 18 Jun 2019 11:52:52 +0000 (13:52 +0200)
		1	2
config.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/example.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history