From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 1 Mar 2017 10:18:52 +0000 (+0100)
Subject: Merge !218: cherry-picks for 1.2.4
X-Git-Tag: v1.2.4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a034f99575ea2e2e381d8d95d5101ed7867a2de;p=thirdparty%2Fknot-resolver.git

Merge !218: cherry-picks for 1.2.4
---

2a034f99575ea2e2e381d8d95d5101ed7867a2de