Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2867

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

bk: 559505dfidA1Wj3KO4OeqMvc8pVJww

diff --cc ChangeLog
index 26ee0e80f98d4f182cab66691e7bb7e3bafc7c53,4dce12efb3579f7657a5edb0fe7ad13b085535a6..feb47a14cc34be6fc06302c86ca1524bd2ce706f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  ---
  
 +* [Bug 2864] 4.2.8p3 fails to compile on Windows. Juergen Perlinger
+ * [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'. J.Perlinger
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>