Merge max.pfcs.com:/home/harlan/ntp-stable

into  max.pfcs.com:/usr/home/harlan/ntp-stable-p8

bk: 57442c647YWLX33hOeneWclyyryDxQ

diff --cc ChangeLog
index 6c1f7d2b07e1f82c1da12f933b6b07908f8dbcd6,f2f51e2faaf3fc0e1f3a382793b42b640da7ddf9..2e5c3b0ac209986748a1136f691ae4ce7d49e122
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,9 @@@
  ---
  
+ * [Sec 3042] Broadcast Interleave.  HStenn.
 +* [Sec 3043]  Autokey association reset. perlinger@ntp.org, stenn@ntp.org
 +  (fixes [Sec 3044] and [Sec 3045], too)
 +* [Sec 3046] CRYPTO_NAK crash.  stenn@ntp.org
  * [Bug 3038] NTP fails to build in VS2015. perlinger@ntp.org
    - provide build environment
    - 'wint_t' and 'struct timespec' defined by VS2015

diff --cc ntpd/ntp_proto.c
Simple merge