Merge branch 'master' into auth-load-thread

diff --cc daemon/daemon.c
Simple merge

diff --cc daemon/daemon.h
index 9965ed558f10c330b8c7a711fe8bfa44a883af33,e6f099629be1377f1f5efe9216ac6d55c9c73040..dad339940dd5a35de4d451dfb95973bf0c9b3ead
--- 1/daemon/daemon.h
--- 2/daemon/daemon.h
+++ b/daemon/daemon.h
@@@ -62,7 -62,7 +62,8 @@@ struct doq_table
  struct cookie_secrets;
  struct fast_reload_thread;
  struct fast_reload_printq;
 +struct auth_load_general_info;
+ struct shared_ports;
  
  #include "dnstap/dnstap_config.h"
  #ifdef USE_DNSTAP

diff --cc daemon/remote.c
Simple merge

diff --cc services/authzone.c
Simple merge

diff --cc util/configparser.y
Simple merge

diff --cc util/fptr_wlist.c
Simple merge