From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 22 Feb 2016 01:24:10 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6a528fadf5503bde7268ca7bca012aa1e956e9d;p=thirdparty%2Fntp.git

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

bk: 56ca633aX5WZPJWl2prdP5Lh65LT6w
---

c6a528fadf5503bde7268ca7bca012aa1e956e9d
diff --cc ChangeLog
index a3c865190,a1d26dd7e..79d37ecb4
--- a/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>