Add CHANGES and release note for [GL #3178] and [GL #3636]

(cherry picked from commit 2df311eb214baa999badb5d425e9bc349316ba6d)

diff --git a/CHANGES b/CHANGES
index d425956fb3fb62461e9dd8858bf07b830935b524..f713777143ffb35226e68609a548abafdadbf13a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6051.  [bug]           Improve thread safety in the dns_dispatch unit.
+                       [GL #3178] [GL #3636]
+
 6050.  [bug]           Changes to the RPZ response-policy min-update-interval
                        and add-soa options now take effect as expected when
                        named is reconfigured. [GL #3740]

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 7b925d0526fa8784249d10c6be7c9012eff19903..0f4f0e8c01fa81f225e229ec7709fdfdfccf12fb 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -49,6 +49,9 @@ Bug Fixes
   structures used for "housekeeping") and exclude recently used (<= 10 seconds)
   ADB names and entries from the overmem memory cleaner. :gl:`#3739`
 
+- Fix a rare assertion failure in the outgoing TCP DNS connection handling.
+  :gl:`#3178` :gl:`#3636`
+
 Known Issues
 ~~~~~~~~~~~~