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

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-aes128cmac

bk: 58e8ab394JMFSZ1KNhzSs602bDlo2Q

diff --cc ChangeLog
index 1fdaaf35eef69ec4d7693500ec4779279aa0112f,8486ad12714259f25b13cf2b71f8446515e37777..ae2fd19545d068f8b963d9028420286c02a5dcf4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,10 +1,11 @@@
  ---
  
 +* AES-128-CMAC support
+ * [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
  
  ---
- (4.2.8p10)
+ (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
  
- * [Sec 3393] clang scan-build findings <perlinger@ntp.org>
  * [Sec 3389] NTP-01-016: Denial of Service via Malformed Config
    (Pentest report 01.2017) <perlinger@ntp.org>
  * [Sec 3388] NTP-01-014: Buffer Overflow in DPTS Clock

diff --cc ports/winnt/instsrv/instsrv.c
Simple merge