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

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

bk: 5f8ead45vspXO3J8bVLaPieb13L0Vg

diff --cc ChangeLog
index 6e47c4ab2b79c56b33dca683949527291bacddba,0a54f2775f5aba58116234deb9a68647cf20154a..6aaec9ec9dc16ebe6de30508cdeec5db8c819c2c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,5 +1,14 @@@
  ---
 +
+ * [Bug 3688] GCC 10 build errors in testsuite <perlinger@ntp.org>
 +* [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 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
  
  ---
  (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>