merge cleanup

bk: 557c00b8WrzrszZzYHiIiy9s5Kke3w

diff --git a/ChangeLog b/ChangeLog
index 3621e546a0a3ac11ed9d51eb7c66cb6dc44cc7ce..205dfb4f58b3fa887cc1d75001182f82bbabda33 100644 (file)
--- 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: