Merge master into doq-server

diff --cc daemon/io.c
Simple merge

diff --cc daemon/io.h
Simple merge

diff --cc daemon/session2.c
Simple merge

diff --cc daemon/session2.h
Simple merge

diff --cc daemon/worker.c
Simple merge

diff --cc doc/_static/config.schema.json
Simple merge

diff --cc meson.build
Simple merge

diff --cc python/knot_resolver/datamodel/logging_schema.py
Simple merge

diff --cc python/knot_resolver/datamodel/network_schema.py
index c4b5f3e934447f60038b3a3ca54b05ef941290c2,e3011bcd20faabab6753147bbe76c7f4e92aab61..787ee67ddf5f65d9bbf1cda9ec52abd25467df1a
--- 1/python/knot_resolver/datamodel/network_schema.py
--- 2/python/knot_resolver/datamodel/network_schema.py
+++ b/python/knot_resolver/datamodel/network_schema.py
@@@ -206,11 -182,10 +206,11 @@@ class NetworkSchema(ConfigSchema)
      edns_tcp_keepalive: Allows clients to discover the connection timeout. (RFC 7828)
      edns_buffer_size: Maximum EDNS payload size advertised in DNS packets. Different values can be configured for communication downstream (towards clients) and upstream (towards other DNS servers).
      address_renumbering: Renumbers addresses in answers to different address space.
 -    tls: TLS configuration, also affects DNS over TLS and DNS over HTTPS.
 +    tls: TLS configuration, also affects DNS over TLS, DNS over HTTPS and DNS over QUIC.
 +    quic: DNS over QUIC configuration.
      proxy_protocol: PROXYv2 protocol configuration.
      listen: List of interfaces to listen to and its configuration.
-     """
+     """  # noqa: E501
  
      do_ipv4: bool = True
      do_ipv6: bool = True

diff --cc python/knot_resolver/datamodel/types/types.py
Simple merge

diff --cc python/knot_resolver/manager/metrics/prometheus.py
Simple merge