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

into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2957

bk: 564ac097OR5gfBSwdGENQDLBe3ynPQ

diff --cc ChangeLog
index ba012830ee67693be1ee1065ca24b235ea64cae0,0f9ac65a0e8a8c250b40eabb33ab0b23ce718cc2..baf817f545ce7a8c3b714f20c63a90d2d8c91aa7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,9 -5,10 +5,13 @@@
  * [Bug 2954] Version 4.2.8p4 crashes on startup with sig fault
    - fixed data race conditions in threaded DNS worker. perlinger@ntp.org
    - limit threading warm-up to linux; FreeBSD bombs on it. perlinger@ntp.org
+ * [Bug 2957] 'unsigned int' vs 'size_t' format clash. perlinger@ntp.org
+   - accept key file only if there are no parsing errors
+   - fixed size_t/u_int format clash
+   - fixed wrong use of 'strlcpy'
 +* [Bug 2965] Local clock didn't work since 4.2.8p4.  Martin Burnicki.
 +* Unity cleanup for FreeBSD-6.4.  Harlan Stenn.
 +* Unity test cleanup.  Harlan Stenn.
  ---
  (4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>