Merge branch 'master' into hints-name-order

... to fix conflict in NEWS.

diff --cc NEWS
index 1a02ea18fe20c1e77071660215bfaca8e8a6cba6,2f01ee746783dd86e77e8f26bcc1ece0bb19f1a3..9b9b53d24401fd31701ae8fe39d3554eaba7051f
--- 1/NEWS
--- 2/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
  ------------