From: Petr Špaček <petr.spacek@nic.cz>
Date: Mon, 11 Sep 2017 10:55:54 +0000 (+0200)
Subject: Merge branch 'max-resolve-time' into 'master'
X-Git-Tag: v1.4.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc1229ce522041539ad8816c0d67438171c7b13f;p=thirdparty%2Fknot-resolver.git

Merge branch 'max-resolve-time' into 'master'

Limit maximal resolution time

Closes #241

See merge request !368
---

fc1229ce522041539ad8816c0d67438171c7b13f