Merge tag 'v9.18.21' into bind-9.18

diff --cc CHANGES
index c05b1750ecf04037b1805ea4ef648df040c4387d,913aad02911cd86f31f035375770dd9fecea00bd..cbc239b142f5ce01a56790d0dd875203aac4fe2a
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,18 -1,5 +1,20 @@@
 +6306. [func]          Log more details about the cause of "not exact" errors.
 +                      [GL #4500]
 +
 +6304. [bug]           The wrong time was being used to determine what RRSIGs
 +                      where to be generated when dnssec-policy was in use.
 +                      [GL #4494]
 +
 +6302. [func]          The "trust-anchor-telemetry" statement is no longer
 +                      marked as experimental. This silences a relevant log
 +                      message that was emitted even when the feature was
 +                      explicitly disabled. [GL #4497]
 +
 +6299. [port]          NetBSD has added 'hmac' to libc which collides with our
 +                      use of 'hmac'. [GL #4478]
 +
+       --- 9.18.21 released ---
+ 
  6297. [bug]           Improve LRU cleaning behaviour. [GL #4448]
  
  6296. [func]          The "resolver-nonbackoff-tries" and

diff --cc doc/arm/notes.rst
index 7a51b557fad83245b25c602c1f6f460989ebfeae,3bae4f1f7bbe7ccc136eb5e884542b362a370e31..1caec1b10301122ba8482bfaf25b16f8a255f67f
--- 1/doc/arm/notes.rst
--- 2/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@@ -35,7 -35,7 +35,8 @@@ information about each release, and sou
  
  .. include:: ../notes/notes-known-issues.rst
  
 +.. include:: ../notes/notes-current.rst
+ .. include:: ../notes/notes-9.18.21.rst
  .. include:: ../notes/notes-9.18.20.rst
  .. include:: ../notes/notes-9.18.19.rst
  .. include:: ../notes/notes-9.18.18.rst