From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 13 Apr 2021 12:01:38 +0000 (+0200)
Subject: Merge branch 'master' of github.com:NLnetLabs/unbound
X-Git-Tag: release-1.13.2rc1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88b9c9ffd9172d514f4deb6918a1ec18f9825ef;p=thirdparty%2Funbound.git

Merge branch 'master' of github.com:NLnetLabs/unbound
---

b88b9c9ffd9172d514f4deb6918a1ec18f9825ef
diff --cc doc/Changelog
index 1ff1abbf6,1f61b19bb..8abea8ee6
--- a/doc/Changelog
+++ b/doc/Changelog
@@@ -1,6 -1,7 +1,10 @@@
 +13 April 2021: George
 +	- Fix documentation comment for files previously residing in checkconf/.
 +
+ 13 April 2021: Wouter
+ 	- Fix that nxdomain synthesis does not happen above the stub or
+ 	  forward definition.
+ 
  12 April 2021: George
  	- Fix (increase) verbosity level for iterator error log in
  	  processQueryTargets().