From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 19 Jan 2020 04:20:34 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P13~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e4390da3a4aa51a47309429cee13a55c7124bb2;p=thirdparty%2Fntp.git

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

bk: 5e23d912FaOkJuJWIQ-iAfY2nhtQaQ
---

7e4390da3a4aa51a47309429cee13a55c7124bb2
diff --cc ChangeLog
index 0f22f053d,6990dcfa4..9e34baec9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -2,10 -2,8 +2,11 @@@
  
  * [Sec 3610] process_control() should bail earlier on short packets. stenn@
    - Reported by Philippe Antoine
 +* [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 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>