From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 31 Jan 2022 10:28:30 +0000 (+0100)
Subject: Merge branch 'master' of github.com:NLnetLabs/unbound
X-Git-Tag: release-1.15.0rc1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10d98041492c88f1162f12e1df1f2d22372b926d;p=thirdparty%2Funbound.git

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

10d98041492c88f1162f12e1df1f2d22372b926d
diff --cc doc/Changelog
index 534987789,5e3426e4a..dd8ef17a2
--- a/doc/Changelog
+++ b/doc/Changelog
@@@ -1,6 -1,6 +1,9 @@@
 +31 January 2022: George
 +	- Fix review comment for use-after-free when failing to send UDP out.
 +
+ 31 January 2022: Wouter
+ 	- iana portlist update.
+ 
  29 January 2022: George
  	- Fix tls-* and ssl-* documented alternate syntax to also be available
  	  through remote-control and unbound-checkconf.