From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 11 Jun 2018 07:58:16 +0000 (+0200)
Subject: Merge branch 'master' into cache-NSEC3
X-Git-Tag: v2.4.0~19^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c2ce7ea3f6a281d210f1a00bcf8a1c02491b674;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into cache-NSEC3
---

8c2ce7ea3f6a281d210f1a00bcf8a1c02491b674