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

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

bk: 56ca6561pLy--HF-9gXyBxMgsmQEAg

diff --cc ChangeLog
index 79d37ecb406dc48d44c709796c57447d5652db44,7e99e843b1fe15ae51dc57a8f681f03f98042512..3e45f4a3ad3418a2b91775fcba0090c568f75a43
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,12 -2,9 +2,15 @@@
  
  * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org
  * [Bug 2995] Fixes to compile on Windows
 -  - A change related [Bug 2853] forbids trailing white space in
 -    remote config command. perlinger@ntp.org
 +* [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
+ * [Bug 3015] ntpq: config-from-file: "request contains an unprintable character"
++  - A change related to [Bug 2853] forbids trailing white space in
++    remote config commands. 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>