Merge cleanup

bk: 5eb7cd12T-SqontTPf02EiDykbS-7A

diff --git a/ChangeLog b/ChangeLog
index 1008f370a0f9f2943b870ca7106b9cfaa705a8af..8435f36a548ea0f0fd4b0032899313ef7f313bed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,8 @@
----
-* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
-  - limit number of receive buffers, with an iron reserve for refclocks
-
 ---
 (4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
 
+* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
+  - limit number of receive buffers, with an iron reserve for refclocks
 * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
 * [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
 * [Bug 3659] Move definition of psl[] from ntp_config.h to