Merge cleanup

bk: 54f1a691OV4TRgtn_DmnytibpUkr7g

diff --git a/ChangeLog b/ChangeLog
index c6db8c976a7900207a804b1203b256d0176d8ec5..a36414bcdc43ca362fac7dc06ab4055585401807 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Below are from 4.2.8p2:
 * [Bug 2756] ntpd hangs in startup with gcc 3.3.5 on ARM.
 * [Bug 2757] Quiet compiler warnings.
 * [Bug 2759] Expose nonvolatile/clk_wander_threshold to ntpq.
+* [Bug 2766] ntp-keygen output files should not be world-readable.
 (4.3.2) 2015/02/25 Released by Harlan Stenn <stenn@ntp.org>
 (4.3.1) 2015/02/21 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p2: