From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 12 Feb 2024 13:06:28 +0000 (+0100)
Subject: Merge branch 'master' into 6.0
X-Git-Tag: v6.0.6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4410e100833d31e0033b727c38aa1772deef8e5f;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into 6.0

There were some conflicts with !1495
---

4410e100833d31e0033b727c38aa1772deef8e5f