merge cleanup

bk: 5574d761gzf9AdwGi2PTTKB9T6qN-Q

diff --git a/ChangeLog b/ChangeLog
index d89fc3494ee040a11f8b5b26018fbd4db8f5faa1..8085f87a94539f9cde354e1be1492570de96efde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Below are from 4.2.8p3:
+* [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey
+   Update autokey data ASAP when 'sys_tai' changes.
+   Fix unit test that was broken by changes for autokey update.
+   Avoid potential signature length issue and use DPRINTF where possible
+     in ntp_crypto.c.
 (4.3.36) 2015/06/07 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2836] DFC77 patches from Frank Kardel to make decoding more