merge cleanup

bk: 560b8768fuRvcWYPSLfnl_q5AHO9jw

diff --git a/ChangeLog b/ChangeLog
index fcd8f6fd5e0cf765ee75cd9306ed086842b3ea04..208a0be2b3b83e10f7cd68e80152b6256c4346e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Below are from 4.2.8p4:
+* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
+  privileges and limiting resources in NTPD removes the need to link
+  forcefully against 'libgcc_s' which does not always work. J.Perlinger
+* Implement --disable-problem-tests (off by default).  Harlan Stenn.
 (4.3.73) 2015/09/29 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * More updates for bug 2817.  Harlan Stenn.
@@ -462,7 +467,7 @@ From 4.2.8p2:
 
 ntp-4.3 begins.
 ---
-* [Bug2332](reopened) Exercise thread cancellation once before dropping
+* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
   privileges and limiting resources in NTPD removes the need to link
   forcefully against 'libgcc_s' which does not always work. J.Perlinger
 * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.