Merge tag 'v9.19.18'

diff --cc CHANGES
index eecdf51e0fe5755a94d0931e4d901f8ea3afbb59,1888012a675f96454fc294fca48a1d7e27ffd66d..9c49510cf74a042214c59ac9cf38a76669bdb59c
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,18 -1,5 +1,20 @@@
 +6285. [func]          Remove AES-based DNS cookies. [GL #4421]
 +
 +6284. [bug]           Fix a catz db update notification callback registration
 +                      logic error, which could cause an assertion failure when
 +                      receiving an AXFR update for a catalog zone while the
 +                      previous update process of the catalog zone was already
 +                      running. [GL #4418]
 +
 +6283. [bug]           Fix a data race in isc_hashmap by using atomics for the
 +                      iterators number. [GL !8474]
 +
 +6282. [func]          Deprecate AES-based DNS cookies. [GL #4421]
 +
 +6281. [bug]           Fix a data race in dns_tsigkeyring_dump(). [GL #4328]
 +
+       --- 9.19.18 released ---
+ 
  6280. [bug]           Fix missing newlines in the output of "rndc nta -dump".
                        [GL !8454]
  

diff --cc doc/arm/notes.rst
index 5eff08bf47a3e86f19c2b6523a273d104796fbcd,67710fe4fedd8c86a7bdef764b9edc18d947da4e..947760fca9c2635b6eb5eb353727c66618d5d31e
--- 1/doc/arm/notes.rst
--- 2/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@@ -38,7 -38,7 +38,8 @@@ information about each release, and sou
  
  .. include:: ../notes/notes-known-issues.rst
  
 +.. include:: ../notes/notes-current.rst
+ .. include:: ../notes/notes-9.19.18.rst
  .. include:: ../notes/notes-9.19.17.rst
  .. include:: ../notes/notes-9.19.16.rst
  .. include:: ../notes/notes-9.19.15.rst

diff --cc doc/arm/reference.rst
Simple merge