Merge remote-tracking branch 'main/master' into rpz

diff --cc pdns/dnsparser.cc
Simple merge

diff --cc pdns/dnsparser.hh
Simple merge

diff --cc pdns/dnssecinfra.hh
Simple merge

diff --cc pdns/pdns_recursor.cc
Simple merge

diff --cc pdns/reczones.cc
Simple merge

diff --cc pdns/resolver.cc
Simple merge

diff --cc pdns/syncres.cc
Simple merge