From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 11:22:04 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_85~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5b5619f7b62cffcf60dda45390e9001b24958d1;p=thirdparty%2Fntp.git

merge cleanup

bk: 565ed45c0OZfzzSCRE3CqzyxLg4zzg
---

diff --git a/ChangeLog b/ChangeLog
index 0a669d323..83d9f476a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ Below are from 4.2.8p5:
   - applied patch by Christos Zoulas.  perlinger@ntp.org
 * [Bug 2967] ntpdate command suffers an assertion failure
   - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
+* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+  - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
 (4.3.84) 2015/11/26 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.