Merge branch 'master' into dnsoverquic

diff --cc daemon/worker.c
Simple merge

diff --cc doc/example.conf.in
Simple merge

diff --cc doc/unbound.conf.5.in
Simple merge

diff --cc testcode/fake_event.c
Simple merge

diff --cc util/config_file.c
Simple merge

diff --cc util/config_file.h
Simple merge

diff --cc util/configlexer.lex
Simple merge

diff --cc util/configparser.y
index ae94f41fe028ccfbdff1a2a96183453aecfd0606,ef55216adb11784bc8f543adf400accaa3215707..97ef45c867dbb803bfaa65082e9327aca8d5f83d
--- 1/util/configparser.y
--- 2/util/configparser.y
+++ b/util/configparser.y
@@@ -198,8 -198,8 +198,8 @@@ extern struct config_parser_state* cfg_
  %token VAR_RPZ_SIGNAL_NXDOMAIN_RA VAR_INTERFACE_AUTOMATIC_PORTS VAR_EDE
  %token VAR_INTERFACE_ACTION VAR_INTERFACE_VIEW VAR_INTERFACE_TAG
  %token VAR_INTERFACE_TAG_ACTION VAR_INTERFACE_TAG_DATA
- %token VAR_PROXY_PROTOCOL_PORT VAR_QUIC_PORT VAR_STATISTICS_INHIBIT_ZERO
- %token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_QUIC_SIZE
 -%token VAR_PROXY_PROTOCOL_PORT VAR_STATISTICS_INHIBIT_ZERO
++%token VAR_PROXY_PROTOCOL_PORT VAR_QUIC_PORT VAR_QUIC_SIZE VAR_STATISTICS_INHIBIT_ZERO
+ %token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_DISABLE_EDNS_DO
  
  %%
  toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@@ -331,9 -331,9 +331,9 @@@ content_server: server_num_threads | se
        server_edns_client_string_opcode | server_nsid |
        server_zonemd_permissive_mode | server_max_reuse_tcp_queries |
        server_tcp_reuse_timeout | server_tcp_auth_query_timeout |
-       server_interface_automatic_ports | server_ede | server_quic_port |
 -      server_interface_automatic_ports | server_ede |
++      server_interface_automatic_ports | server_ede | server_quic_port | server_quic_size |
        server_proxy_protocol_port | server_statistics_inhibit_zero |
-       server_harden_unknown_additional | server_quic_size
+       server_harden_unknown_additional | server_disable_edns_do
        ;
  stubstart: VAR_STUB_ZONE
        {