merge cleanup

bk: 565ed13aotY0rWFOuQ-kqFb6dWDjHQ

diff --git a/ChangeLog b/ChangeLog
index 4c70ff17fdab4323b571043b32a1cd4d07dd469a..4af76b9ff1cd226c66409723ad22f53f6035a17c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ Below are from 4.2.8p5:
   - fudge stratum only accepts values [0..16]. perlinger@ntp.org
 * [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
   - applied patch by Christos Zoulas.  perlinger@ntp.org
+* [Bug 2967] ntpdate command suffers an assertion failure
+  - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
 (4.3.84) 2015/11/26 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.