merge cleanup

bk: 55aca458tf0K19HWihXe65U7S0j24w

diff --git a/ChangeLog b/ChangeLog
index 22d5ae3847163b8bc20c7b508637bc958b2e5a08..514f9be2719e1c568c41fc1c39deb7e127ea53aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Below are from 4.2.8p4:
   be reverted once Bug 2043 has been fixed.
 * libntp/icom.c: Typo fix.  Harlan Stenn.
 * util/ntptime.c: initialization nit.  Harlan Stenn.
+* ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr).  Harlan Stenn.
 (4.3.61) 2015/07/19 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * Code cleanup.  Harlan Stenn.