From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 29 Jun 2022 08:44:43 +0000 (+0200)
Subject: Merge branch 'master' of github.com:NLnetLabs/unbound
X-Git-Tag: release-1.16.1rc1~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=352e1b28a11038fd65bce81cc6abcf19c433578e;p=thirdparty%2Funbound.git

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

352e1b28a11038fd65bce81cc6abcf19c433578e
diff --cc doc/Changelog
index 6316504d0,1af2a6fa7..4e0716e50
--- a/doc/Changelog
+++ b/doc/Changelog
@@@ -1,7 -1,8 +1,10 @@@
+ 29 June 2022: Wouter
+ 	- iana portlist update.
+ 
  28 June 2022: George
  	- Show the output of the exact .rpl run that failed with 'make test'.
 +	- Fix for cached 0 TTL records to not trigger prefetching when
 +	  serve-expired-client-timeout is set.
  
  28 June 2022: Wouter
  	- Fix test program dohclient close to use portability routine.