Merge tl.davehart.net:C:/ntp/stable/ntp-stable-3640

into  tl.davehart.net:C:/ntp/stable/ntp-stable-3784

bk: 63f3c3101PwyzNDurcsjI6dS_5I4rA

diff --cc ChangeLog
index 048ba9aefa3c0d501b34c1be787ce5d069aed3b2,b4b01f4885fa816fd4657ed060b8b5524ff0013a..6fef4f5815fd9af3884b014a2eace27aaacf378d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,5 +1,59 @@@
++
 +---
+ * [Bug 3640] document "discard monitor" and fix the code. <hart@ntp.org>
+   - fixed bug identified by Edward McGuire <perlinger@ntp.org>
 +* [Bug 3660] Revert 4.2.8p15 change to manycast. <hart@ntp.org>
 +* [Bug 3786] Timer starvation on high-load Windows ntpd. <hart@ntp.org>
 +* [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
 +* [Bug 3784] high-load ntpd on Windows deaf after enough ICMP TTL exceeded <hart@ntp.org>
 +* [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
 +* [Bug 3758] Provide a 'device' config statement for refclocks <perlinger@ntp.org> 
 +* [Bug 3757] Improve handling of Linux-PPS in NTPD <perlinger@ntp.org>
 +* [Bug 3741] 4.2.8p15 can't build with glibc 2.34 <perlinger@ntp.org>
 +* [Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows <perlinger@ntp.org>
 +  - openssl applink needed again for openSSL-1.1.1
 +* [Bug 3699] Problems handling drift file and restoring previous drifts <perlinger@ntp.org>
 +  - command line options override config statements where applicable
 +  - make initial frequency settings idempotent and reversible
 +  - make sure kernel PLL gets a recovered drift componsation
 +* [Bug 3695] Fix memory leak with ntpq on Windows Server 2019 <perlinger@ntp.org>
 +* [Bug 3694] NMEA refclock seems to unnecessarily require location in messages
 +  - misleading title; essentially a request to ignore the receiver status.
 +    Added a mode bit for this. <perlinger@ntp.org>
 +* [Bug 3693] Improvement of error handling key lengths <perlinger@ntp.org>
 +  - original patch by Richard Schmidt, with mods & unit test fixes
 +* [Bug 3692] /dev/gpsN requirement prevents KPPS <perlinger@ntp.org>
 +  - implement/wrap 'realpath()' to resolve symlinks in device names
 +* [Bug 3691] Buffer Overflow reading GPSD output
 +  - original patch by matt<ntpbr@mattcorallo.com>
 +  - increased max PDU size to 4k to avoid truncation
 +* [Bug 3690] newline in ntp clock variable (parse) <perlinger@ntp.org>
 +  - patch by Frank Kardel
 +* [Bug 3689] Extension for MD5, SHA-1 and other keys <perlinger@ntp.org>
 +  - ntp{q,dc} now use the same password processing as ntpd does in the key
 +    file, so having a binary secret >= 11 bytes is possible for all keys.
 +    (This is a different approach to the problem than suggested)
 +* [Bug 3688] GCC 10 build errors in testsuite <perlinger@ntp.org>
 +* [Bug 3687] ntp_crypto_rand RNG status not known <perlinger@ntp.org>
 +  - patch by Gerry Garvey
 +* [Bug 3682] Fixes for warnings when compiled without OpenSSL <perlinger@ntp.org>
 +  - original patch by Gerry Garvey
 +* [Bug 3677] additional peer events not decoded in associations listing <perlinger@ntp.org>
 +  - original patch by Gerry Garvey
 +* [Bug 3676] compiler warnings (CMAC, interrupt_buf, typo, fallthrough)
 +  - applied patches by Gerry Garvey
 +* [Bug 3675] ntpq ccmds[] stores pointer to non-persistent storage
 +* [Bug 3674] ntpq command 'execute only' using '~' prefix <perlinger@ntp.org>
 +  - idea+patch by Gerry Garvey
 +* [Bug 3672] fix biased selection in median cut <perlinger@ntp.org>
 +* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
 +  - follow-up: fix inverted sense in check, reset shortfall counter
 +* [Bug 3626] (SNTP) UTC offset calculation needs dst flag <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
 +  - backport from -dev, plus some more work on warnings for unchecked results
 +* Implement NTP_FUNC_REALPATH.  <stenn@ntp.org>
 +* Lose a gmake construct in ntpd/Makefile.am.  <stenn@ntp.org>
  
  ---
  (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>