From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 16 Apr 2020 09:48:53 +0000 (+0200)
Subject: Merge branch 'master' of github.com:NLnetLabs/unbound
X-Git-Tag: release-1.11.0~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2193d06af61c878b2eb09b16c95dbdc0e42e975d;p=thirdparty%2Funbound.git

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

2193d06af61c878b2eb09b16c95dbdc0e42e975d
diff --cc doc/Changelog
index 70e71ab93,fd271ea5f..b779a58c4
--- a/doc/Changelog
+++ b/doc/Changelog
@@@ -1,6 -1,6 +1,9 @@@
 +16 April 2020: Wouter
 +	- Fix help return code in unbound-control-setup script.
 +
+ 15 April 2020: George
+ 	- Fix #220: auth-zone section in config may lead to segfault.
+ 
  7 April 2020: Wouter
  	- Merge PR #214 from gearnode: unbound-control-setup recreate
  	  certificates.  With the -r option the certificates are created