From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 13 Jun 2015 10:06:48 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_40~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4692ff462cb744bae103e94205331dc543252b5e;p=thirdparty%2Fntp.git

merge cleanup

bk: 557c00b8WrzrszZzYHiIiy9s5Kke3w
---

diff --git a/ChangeLog b/ChangeLog
index 3621e546a..205dfb4f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Below are from 4.2.8p3:
+* [Bug 2845] Harden memory allocation in ntpd.
 * Unity test framework
 (4.3.39) 2015/06/12 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3: