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

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

fab700973ab44497cde429df95e641e6252b895d