From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 13 Oct 2021 11:13:09 +0000 (+0200)
Subject: Merge branch 'release-5-4-2' into 'master'
X-Git-Tag: v5.4.2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fobs-knot-resolver-8xyvhu%2Fdeployments%2F1890;p=thirdparty%2Fknot-resolver.git

Merge branch 'release-5-4-2' into 'master'

release 5.4.2

See merge request knot/knot-resolver!1212
---

bc5e5f051efabb71d18f0d6bba2e682f56bf90c4