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

Conflicts:
	Changelog

diff --cc Changelog
index 6b89ababe82f17067132ef7ad8cf6a82dc249f4f,1da28e6d5115002b2c9641d4f6c11b5e92fd6bee..38cc0acd2a34c43143d2061b14c19130af6a683f
--- 1/Changelog
--- 2/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