From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 24 Jul 2017 09:09:15 +0000 (+0200)
Subject: Merge branch 'master' into hints-name-order
X-Git-Tag: v1.3.2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=403660e4f8163b804251ae5d788979dd04f962de;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into hints-name-order

... to fix conflict in NEWS.
---

403660e4f8163b804251ae5d788979dd04f962de
diff --cc NEWS
index 1a02ea18f,2f01ee746..9b9b53d24
--- a/NEWS
+++ b/NEWS
@@@ -10,9 -10,7 +10,9 @@@ Bugfixe
  --------
  - daemon: check existence of config file even if rundir isn't specified
  - policy.FORWARD and STUB: use RTT tracking to choose servers (#125, #208)
- - dns64: fix CNAME problems (#203)  It still won't work with query policies.
+ - dns64: fix CNAME problems (#203)  It still won't work with policy.STUB.
 +- hints: better interpretation of hosts-like files (#204)
 +         also, error out if a bad entry is encountered in the file
  
  Improvements
  ------------