Merge branch 'v9_9_3_patch' into v9_9

diff --cc lib/dns/win32/libdns.def
index ba5b76c0a0ab9f30cf9c005e191ffebd7d6d70c9,e1a8e3d54a75059d2484adc03b600a32dcb38c67..3e7518d8ba3dafe4f112e4e48ba1faa4d758f04d
--- 1/lib/dns/win32/libdns.def
--- 2/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@@ -831,8 -831,8 +831,9 @@@ dns_zone_getoption
  dns_zone_getorigin
  dns_zone_getprivatetype
  dns_zone_getqueryacl
+ dns_zone_getqueryonacl
  dns_zone_getraw
 +dns_zone_getqueryaoncl
  dns_zone_getrequeststats
  dns_zone_getserial
  dns_zone_getserial2