Merge tag 'v9.16.48' into bind-9.16

BIND 9.16.48

diff --cc CHANGES
index 9f48285d9157882d65cf4d3c8646a2e7ee2c2bfc,4e03556ab864b27a3b0b4e0fca9ab4fe79985b5a..773765388f16fca55ec6eba847147cca6846d416
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,7 -1,35 +1,39 @@@
 +6338. [func]          Optimize slabheader placement, so the infrastructure
 +                      records are put in the beginning of the slabheader
 +                      linked list. [GL !8675]
 +
+       --- 9.16.48 released ---
+ 
+ 6343. [bug]           Fix case insensitive setting for isc_ht hashtable.
+                       [GL #4568]
+ 
+       --- 9.16.47 released ---
+ 
+ 6322. [security]      Specific DNS answers could cause a denial-of-service
+                       condition due to DNS validation taking a long time.
+                       (CVE-2023-50387) [GL #4424]
+ 
+ 6321. [security]      Change 6315 inadvertently introduced regressions that
+                       could cause named to crash. [GL #4234]
+ 
+       --- 9.16.46 released ---
+ 
+ 6319. [security]      Query patterns that continuously triggered cache
+                       database maintenance could exhaust all available memory
+                       on the host running named. (CVE-2023-6516) [GL #4383]
+ 
+ 6317. [security]      Restore DNS64 state when handling a serve-stale timeout.
+                       (CVE-2023-5679) [GL #4334]
+ 
+ 6316. [security]      Specific queries could trigger an assertion check with
+                       nxdomain-redirect enabled. (CVE-2023-5517) [GL #4281]
+ 
+ 6315. [security]      Speed up parsing of DNS messages with many different
+                       names. (CVE-2023-4408) [GL #4234]
+ 
+ 6314. [bug]           Address race conditions in dns_tsigkey_find().
+                       [GL #4182]
+ 
  6304. [bug]           The wrong time was being used to determine what RRSIGs
                        where to be generated when dnssec-policy was in use.
                        [GL #4494]

diff --cc doc/arm/notes.rst
index b0fc8b6ec94189d9f356dc066a57011d6ac14041,1fecc7758626295814343161f258d9394cde9528..00c2360f83ae26d4dd978d69151e540107c4e863
--- 1/doc/arm/notes.rst
--- 2/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@@ -46,7 -46,9 +46,10 @@@ for Microsoft Windows operating systems
  
  .. include:: ../notes/notes-known-issues.rst
  
 +.. include:: ../notes/notes-current.rst
+ .. include:: ../notes/notes-9.16.48.rst
+ .. include:: ../notes/notes-9.16.47.rst
+ .. include:: ../notes/notes-9.16.46.rst
  .. include:: ../notes/notes-9.16.45.rst
  .. include:: ../notes/notes-9.16.44.rst
  .. include:: ../notes/notes-9.16.43.rst

diff --cc lib/dns/rbtdb.c
Simple merge