]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 22 Feb 2016 01:14:05 +0000 (01:14 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 22 Feb 2016 01:14:05 +0000 (01:14 +0000)
into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2999

bk: 56ca60dd_FE4v2ZnveOTx-gNlP33Hg

1  2 
ChangeLog

diff --cc ChangeLog
index f642b05bd112d0900c235f47152551de2337563b,df99fe4658817f4f8e483e20931d41f0f6cd064e..a3c865190a3b33fae62c86a930c371e6d3252d5a
+++ 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>