Merge branch 'branch-1.24.1'

diff --cc daemon/remote.c
Simple merge

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

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

diff --cc doc/unbound.conf.rst
Simple merge

diff --cc testdata/rrset_use_cached.rpl
Simple merge

diff --cc testdata/serve_expired.rpl
index 4aa65e1676a155252eb01b3b6f0b3a885c7e08c0,573e18bcf3209e8286630253878b30da083d8052..2fd7459c1d4932613ad133814df7e127e2a334e5
--- 1/testdata/serve_expired.rpl
--- 2/testdata/serve_expired.rpl
+++ b/testdata/serve_expired.rpl
@@@ -3,9 -3,9 +3,10 @@@ server
        module-config: "validator iterator"
        qname-minimisation: "no"
        minimal-responses: no
+       iter-scrub-promiscuous: no
        serve-expired: yes
        serve-expired-client-timeout: 0
 +      serve-expired-reply-ttl: 123
        access-control: 127.0.0.1/32 allow_snoop
        ede: yes
        ede-serve-expired: yes

diff --cc testdata/serve_expired_0ttl_nodata.rpl
index a53df437aeb76df8891950c9563ba5f75e1f890d,4d483534d6b36af09348af7fc675c98e9237e369..6c2f6c92f0f52c55deace9f18130c346e80800e8
--- 1/testdata/serve_expired_0ttl_nodata.rpl
--- 2/testdata/serve_expired_0ttl_nodata.rpl
+++ b/testdata/serve_expired_0ttl_nodata.rpl
@@@ -3,9 -3,9 +3,10 @@@ server
        module-config: "validator iterator"
        qname-minimisation: "no"
        minimal-responses: no
+       iter-scrub-promiscuous: no
        serve-expired: yes
        serve-expired-client-timeout: 0
 +      serve-expired-reply-ttl: 123
        ede: yes
        ede-serve-expired: yes
  

diff --cc testdata/serve_expired_0ttl_nxdomain.rpl
Simple merge

diff --cc testdata/serve_expired_0ttl_servfail.rpl
Simple merge

diff --cc testdata/serve_expired_client_timeout.rpl
Simple merge

diff --cc testdata/serve_expired_client_timeout_servfail.rpl
Simple merge

diff --cc testdata/serve_expired_reply_ttl.rpl
Simple merge

diff --cc testdata/serve_expired_ttl_client_timeout.rpl
Simple merge

diff --cc testdata/serve_expired_zerottl.rpl
Simple merge

diff --cc testdata/subnet_global_prefetch_always_forward.crpl
index f2c8bdb60fcec94c84a1b906ff0e7a33058f4d8c,d32ae6da0d0e489dae45d5fec29b260b3c6a395f..a34a314afb3e9e6af8db015093fb765f18b3d28d
--- 1/testdata/subnet_global_prefetch_always_forward.crpl
--- 2/testdata/subnet_global_prefetch_always_forward.crpl
+++ b/testdata/subnet_global_prefetch_always_forward.crpl
@@@ -14,8 -13,7 +14,9 @@@ server
        access-control: 127.0.0.1 allow_snoop
        qname-minimisation: no
        minimal-responses: no
 +      ede: yes
 +      ede-serve-expired: yes
+       iter-scrub-promiscuous: no
  
  stub-zone:
        name: "."

diff --cc testdata/subnet_global_prefetch_expired.crpl
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
Simple merge