Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2971

into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2971

bk: 565ed266cUxatANu89XKVn3SUi5lvw

diff --cc ChangeLog
index 43991343ecb07a786e4d1e9971fa47ef43fda273,bd0e8233ed4c451a93ca75ada00ec083e1648093..1a23ab1ba14cb4a325ea9116cd3f780d4aad987e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -25,10 -20,10 +25,12 @@@
    - make sure SOCKET values are not truncated (win32-specific)
    - format string fixes
  * [Bug 2965] Local clock didn't work since 4.2.8p4.  Martin Burnicki.
 +* [Bug 2967] ntpdate command suffers an assertion failure
 +  - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
  * [Bug 2969]  Seg fault from ntpq/mrulist when looking at server with
                lots of clients. perlinger@ntp.org
+ * [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+   - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
  * Unity cleanup for FreeBSD-6.4.  Harlan Stenn.
  * Unity test cleanup.  Harlan Stenn.
  * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.