merge cleanup

bk: 56978797uuiTShYJCo035UKOg1AZ4A

diff --git a/ChangeLog b/ChangeLog
index 65cbf28f3c5a758bd184ae1f62ddd459dcb959c9..864175543daca024be9620ed4c490e292421c3cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
   - Found this already fixed, but validation led to cleanup actions.
 * [Bug 2905] DNS lookups broken. perlinger@ntp.org
   - added limits to stack consumption, fixed some return code handling
+* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+  - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
+  - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
 * Make leapsec_query debug messages less verbose.  Harlan Stenn.
 
 ---