From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 6 Apr 2017 06:08:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'old-gitlab/develop' into develop
X-Git-Tag: release-1.7.1-rc1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=211a03ac0ada51821d9929ccb3a924d3c8374d72;p=thirdparty%2Fldns.git

Merge remote-tracking branch 'old-gitlab/develop' into develop
---

211a03ac0ada51821d9929ccb3a924d3c8374d72
diff --cc Changelog
index 35121519,fcf37cff..dbe45c30
--- a/Changelog
+++ b/Changelog
@@@ -2,13 -2,10 +2,16 @@@
  	* ldns-notify can use all supported hash algorithms with -y.
  	* bugfix #1209: make install ldns.pc file
  	  Thanks Oleksandr Natalenko
 +	* bugfix #1218: Only chase DS if signer is parent of owner.
 +	  Thanks Emil Natan
 +	* bugfix #617: Retry WKS service and protocol names lower case.
 +	  Thanks Siali Yan
 +	* Spelling errors in binaries and man pages
 +	  Thanks Andreas Schulze
  	* removed duplicate condition in ldns_udp_send_query.
+ 	* ldns_wire2pkt: fix null pointer dereference if pkt allocation fails
+ 	  and fix memory leak with more EDNS sections
+ 	  Thanks Jan Vcelak
  
  1.7.0	2016-12-20
  	* Fix lookup of relative names in ldns_resolver_search.