From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 24 May 2016 10:26:44 +0000 (-0700)
Subject: Merge max.pfcs.com:/home/harlan/ntp-stable
X-Git-Tag: NTP_4_2_8P8~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4783f963f8e01fb7e491508c0d036254b4ced24c;p=thirdparty%2Fntp.git

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

bk: 57442c647YWLX33hOeneWclyyryDxQ
---

4783f963f8e01fb7e491508c0d036254b4ced24c
diff --cc ChangeLog
index 6c1f7d2b0,f2f51e2fa..2e5c3b0ac
--- a/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