Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3013

bk: 56ca633aX5WZPJWl2prdP5Lh65LT6w

diff --cc ChangeLog
index a3c865190a3b33fae62c86a930c371e6d3252d5a,a1d26dd7e9fec6faa2a29592f0e620059b8b9c89..79d37ecb406dc48d44c709796c57447d5652db44
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,10 -2,8 +2,12 @@@
  
  * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org
  * [Bug 2995] Fixes to compile on Windows
 +* [Bug 2999] out-of-bounds access in 'is_safe_filename()'. perlinger@ntp.org
+ * [Bug 3013] Fix for ssl_init.c SHA1 test. perlinger@ntp.org
+   - Patch provided by Ch. Weisgerber
 +* Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
 +* Fix typo in html/monopt.html.  Harlan Stenn.
  
  ---
  (4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>