Merge branch 'master' of gitlab.nlnetlabs.nl:ldns

Conflicts:
	Changelog

diff --cc Changelog
index 94db4c3461c3f50dae47a63e3f72fc97ebc86732,5b969845ed1959b636f9b8e68a38ec4033bc41ac..3f029590daa0ddcd120cbb9ac52d81667fce410f
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -30,7 -30,7 +30,8 @@@
          dictionary.  Patch from shussain.
        * bugfix #517: ldns_resolver_new_frm_fp error when invoked using a NULL
          file pointer.
 +      * Fix memory leak in contrib/python: ldns_pkt.new_query.
+       * Fix buffer overflow in fget_token and bget_token.
  
  1.6.16        2012-11-13
        * Fix Makefile to build pyldns with BSD make