Merge tag 'v9_18_3' into v9_18

BIND 9.18.3

diff --cc CHANGES
index 161f2fc3f299031cf06a0b238b797373738e63fb,e6b1ba0d0f89e71eec9df3168f5deb64bfa06a66..22e5f50bff9c97dcebb3eec10c63c4dd0aa38864
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,12 -1,9 +1,18 @@@
 +5890. [bug]           When the fetches-per-server quota was adjusted
 +                      because of an authoritative server timing out more
 +                      or less frequently, it was incorrectly set to 1
 +                      rather than the intended value.  This has been
 +                      fixed. [GL #3327]
 +
 +5888. [bug]           Only write key files if the dnssec-policy keymgr has
 +                      changed the metadata. [GL #3302]
 +
+       --- 9.18.3 released ---
+ 
+ 5886. [security]      Fix a crash in DNS-over-HTTPS (DoH) code caused by
+                       premature TLS stream socket object deletion.
+                       (CVE-2022-1183) [GL #3216]
+ 
  5885. [bug]           RPZ NSIP and NSDNAME rule processing didn't handle stub
                        and static-stub zones at or above the query name.  This
                        has now been addressed. [GL #3232]

diff --cc doc/arm/notes.rst
index c1260b48e57250072ac119fbc33dc89bdf34c418,94bd14157353b1bb7f9d5b64f6a598f7fdedbba4..9178215ab81b4d96cb18725ba0eb665ca03b4935
--- 1/doc/arm/notes.rst
--- 2/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@@ -33,7 -33,7 +33,8 @@@ The latest versions of BIND 9 software 
  https://www.isc.org/download/. There you will find additional
  information about each release, and source code.
  
 +.. include:: ../notes/notes-current.rst
+ .. include:: ../notes/notes-9.18.3.rst
  .. include:: ../notes/notes-9.18.2.rst
  .. include:: ../notes/notes-9.18.1.rst
  .. include:: ../notes/notes-9.18.0.rst