Merge branch 'security-master'

diff --cc CHANGES
index d34cc8b978bf1048c50c6bc8f490bc7395bcf967,3047b5d6c641efe04df7315f644c01bef79056db..2f4f972fc7910d5dbf317d27965691fdec91ddb4
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,14 -1,12 +1,20 @@@
- 5299. [placeholder]
 +5301. [bug]           Detect partial prefixes / incomplete IPv4 address in
 +                      acls. [GL #1143]
 +
 +5300. [bug]           dig/mdig/delv: Add a colon after EDNS option names,
 +                      even when the option is empty, to improve
 +                      readability and allow correct parsing of YAML
 +                      output. [GL #1226]
 +
+       --- 9.15.5 released ---
  
- 5298. [placeholder]
+ 5299. [security]      A flaw in DNSSEC verification when transferring
+                       mirror zones could allow data to be incorrectly
+                       marked valid. (CVE-2019-6475) [GL #1252]
+ 
+ 5298. [security]      Named could assert if a forwarder returned a
+                       referral, rather than resolving the query, when QNAME
+                       minimization was enabled. (CVE-2019-6476) [GL #1051]
  
  5297. [bug]           Check whether a previous QNAME minimization fetch
                        is still running before starting a new one; return