From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 1 May 2019 14:24:52 +0000 (+0200)
Subject: Merge branch 'master' into features/XoT
X-Git-Tag: release-1.9.2rc1~22^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16%2Fhead;p=thirdparty%2Funbound.git

Merge branch 'master' into features/XoT
---

d4f697f16058d07013700e5481beeb892a7edc43