git.ipfire.org Git - thirdparty/unbound.git/commit

]> git.ipfire.org Git - thirdparty/unbound.git/commit

author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Thu, 14 Jan 2021 11:11:29 +0000 (12:11 +0100)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Thu, 14 Jan 2021 11:11:29 +0000 (12:11 +0100)
commit	cdb60adcdce937fe92084b2093a7fb7d9cb19c0c
tree	f98cf1b7ec4c5bafbebc49d04b574347568a53b3	tree \| snapshot
parent	3b82e690efc83a96c9e559750fc4576034ad2ea7	commit \| diff
parent	78bcfdee64b20f6bc67e121433034f058b264f42	commit \| diff

Merge branch 'rpz' of https://github.com/magenbluten/unbound into magenbluten-rpz
Conflict fixed for rpz.disabled check added.

Mirror of https://github.com/NLnetLabs/unbound.git