From: Juergen Perlinger <perlinger@ntp.org>
Date: Fri, 10 Jan 2020 07:05:00 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/perlinger/ntp-stable-3627-dirty
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c4f6ef0d15ff1e7e33ba255894fdcbe483bd649;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/perlinger/ntp-stable-3627-dirty
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/perlinger/ntp-stable-3627

bk: 5e18221cd2yh-r7_kAQwPjVX3mUsvA
---

2c4f6ef0d15ff1e7e33ba255894fdcbe483bd649
diff --cc ChangeLog
index 573dd533f,f3816a92d..3317c39a9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -2,8 -2,7 +2,9 @@@
  
  * [Sec 3610] process_control() should bail earlier on short packets. stenn@
    - Reported by Philippe Antoine
+ * [Bug 3634] Typo in discipline.html, reported by Jason Harrison.  stenn@
 +* [Bug 3627] SIGSEGV on FreeBSD-12 with stack limit and stack gap <perlinger@ntp.org>
 +  - integrated patch by Cy Schubert
  * [Bug 3620] memory leak in ntpq sysinfo <perlinger@ntp.org>
    - applied patch by Gerry Garvey
  * [Bug 3619] Honour drefid setting in cooked mode and sysinfo <perlinger@ntp.org>