From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 26 Jan 2022 15:41:04 +0000 (+0100)
Subject: Merge branch 'master' of github.com:NLnetLabs/unbound
X-Git-Tag: release-1.15.0rc1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d10562c823424f62cfeb7f48ce890a8dccaff689;p=thirdparty%2Funbound.git

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

d10562c823424f62cfeb7f48ce890a8dccaff689
diff --cc doc/Changelog
index 5a5f06eb6,abfb32888..34ed20378
--- a/doc/Changelog
+++ b/doc/Changelog
@@@ -1,6 -1,7 +1,10 @@@
+ 26 January 2022: George
+ 	- Fix #599: [FR] RFC 9156 (obsoletes RFC 7816), by noting the new RFC
+ 	  document.
+ 
 +26 January 2022: Wouter
 +	- Test for NSID in SERVFAIL response due to DNSSEC bogus.
 +
  25 January 2022: George
  	- Fix #588: Unbound 1.13.2 crashes due to p->pc is NULL in
  	  serviced_udp_callback.