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

diff --cc ChangeLog
index 573dd533f3a081229b1ad62b822e0b6a6cb08c36,f3816a92d6beedfcf9c73bea893343970bf1c6d7..3317c39a9056e83dac990d0e42a8498ecb3c455c
--- 1/ChangeLog
--- 2/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>