From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 3 Dec 2021 07:50:41 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Tag: release-1.8.4-rc1~40^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48a0672b03f7be8d8187270025b414f102c4960d;p=thirdparty%2Fldns.git

Merge branch 'develop'
---

48a0672b03f7be8d8187270025b414f102c4960d