From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 9 Aug 2013 14:23:26 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.nlnetlabs.nl:ldns
X-Git-Tag: release-1.6.17rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef0bae6869e6535adde68206668dfc82b6978a55;p=thirdparty%2Fldns.git

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

Conflicts:
	Changelog
---

ef0bae6869e6535adde68206668dfc82b6978a55
diff --cc Changelog
index 94db4c34,5b969845..3f029590
--- a/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