Merge branch 'master' of repo.isc.org:/proj/git/prod/bind9

Conflicts:
	CHANGES

diff --cc CHANGES
index 8ee1d0b76a405bc307092abb7e2391420ae077ab,3fcb25b2b3e1e7c039ae94a4b70ff0254bde0a61..932f42f79cb3ab0f3e2b5106ef6fc1276b327e6c
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,6 -1,6 +1,9 @@@
- 3443. [bug]           The NOQNAME proof was not being returned from cached
++3444. [bug]           The NOQNAME proof was not being returned from cached
 +                      insecure responses. [RT #21409]
 +
+ 3443. [bug]           ddns-confgen: Some TSIG algorithms were incorrectly
+                       rejected when generating keys. [RT #31927]
+ 
  3442. [port]          Net::DNS 0.69 introduced a non backwards compatible
                        change. [RT #32216]