From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 22 Feb 2016 01:14:05 +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=e76e1b250c55333ff2ee92d3269d400f503cb27a;p=thirdparty%2Fntp.git

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

bk: 56ca60dd_FE4v2ZnveOTx-gNlP33Hg
---

e76e1b250c55333ff2ee92d3269d400f503cb27a
diff --cc ChangeLog
index f642b05bd,df99fe465..a3c865190
--- a/ChangeLog
+++ b/ChangeLog
@@@ -2,7 -2,9 +2,10 @@@
  
  * [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
+ * 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>