Merge tag 'v9_18_6' into v9_18

BIND 9.18.6

diff --cc CHANGES
index 2561fe2462f25258728d53530585305d1f252f22,0de3c68507f19b21582ced3e4ccf99807e0c6de7..54bd5d6138305d6305482d2a6aa5e5bb533446bb
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,16 -1,5 +1,18 @@@
 +5942. [bug]           Fix tkey.c:buildquery() function's error handling by
 +                      adding the missing cleanup code. [GL #3492]
 +
 +5938. [bug]           An integer type overflow could cause an assertion
 +                      failure when freeing memory. [GL #3483]
 +
 +5936. [bug]           Don't enable serve-stale for lookups that error because
 +                      it is a duplicate query or a query that would be
 +                      dropped. [GL #2982]
 +
 +5935. [bug]           Fix DiG lookup reference counting bug, which could
 +                      be observed in NSSEARCH mode. [GL #3478]
 +
+       --- 9.18.6 released ---
+ 
  5934. [func]          Improve fetches-per-zone fetch limit logging to log
                        the final allowed and spilled values of the fetch
                        counters before the counter object gets destroyed.

diff --cc doc/arm/notes.rst
index e6b5968302021e09c11d2fa7a279ca71ef071e3d,1300a0f3e8417231dc3a2328202cb6270077977a..3485631ec6b7fd88caf36ec3a3072d433ecda4a9
--- 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.6.rst
  .. include:: ../notes/notes-9.18.5.rst
  .. include:: ../notes/notes-9.18.4.rst
  .. include:: ../notes/notes-9.18.3.rst