From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 17 Dec 2013 13:12:05 +0000 (+0100)
Subject: Merge branch 'master' of gitlab.nlnetlabs.nl:ldns
X-Git-Tag: release-1.6.17rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca7aeed9f514271fc79a0b95960566b02bfc1afb;p=thirdparty%2Fldns.git

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

Conflicts:
	Changelog
---

ca7aeed9f514271fc79a0b95960566b02bfc1afb
diff --cc Changelog
index 6b89abab,1da28e6d..38cc0acd
--- a/Changelog
+++ b/Changelog
@@@ -54,7 -54,8 +54,9 @@@
  	  --enable-rrtype-ta
  	* bugfix #530: Don't sign and verify duplicate RRs (Thanks Jelte Jansen)
  	* bugfix #505: Manpage and usage output fixes (Thanks Tomas Hozza)
+ 	* Adjust ldns_sha1() so that the input data is not modified (Thanks
+ 	  Marc Buijsman)
 +	* Disable printing to stderr with --disable-stderr-msgs configure option
  
  1.6.16	2012-11-13
  	* Fix Makefile to build pyldns with BSD make