Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3637

bk: 5e242a76jIdV_sf54Xp-q4J08TNpKQ

diff --cc ChangeLog
index e307082afd3674bf83198af2162393de67cd1f8c,1d68b16b6353c3afb2c28b195f5585cf12925165..00ee95a9479245d19d8435e19461eff6b6cb87e9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,13 -2,8 +2,14 @@@
  
  * [Sec 3610] process_control() should bail earlier on short packets. stenn@
    - Reported by Philippe Antoine
+ * [Bug 3637] Emit the version of ntpd in saveconfig.  stenn@
 +* [Bug 3636] NMEA: combine time/date from multiple sentences <perlinger@ntp.org>
 +* [Bug 3635] Make leapsecond file hash check optional <perlinger@ntp.org>
  * [Bug 3634] Typo in discipline.html, reported by Jason Harrison.  stenn@
 +* [Bug 3628] raw DCF decoding - improve robustness with Zeller's congruence
 +  - implement Zeller's congruence in libparse and libntp <perlinger@ntp.org>
 +* [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>

diff --cc ntpd/ntp_config.c
Simple merge