]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
Merge branch 'master' into rpz-triggers
authorW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Wed, 14 Apr 2021 07:39:41 +0000 (09:39 +0200)
committerW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Wed, 14 Apr 2021 07:39:41 +0000 (09:39 +0200)
1  2 
daemon/worker.c
iterator/iterator.c

diff --cc daemon/worker.c
Simple merge
Simple merge