Merge ntp-testbuild.tal1.ntfo.org:/home/nfs1.chi1/hart/ntp-stable-3842-50

into  ntp-testbuild.tal1.ntfo.org:/home/nfs1.tal1/harlan/ntp/ntp-stable-3842-50

bk: 64c75e928KzLgwZxVuoC9s-nuzV0uA

diff --cc ChangeLog
index d01453527385c57e084a4fce80adf25e625248cb,b0b9dccfb8e49c0c9376ba0bf618b024ee037dc8..4e4344acce66da66dcc572a9408dc65553cefd8b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,9 +1,14 @@@
  ---
  
 -* [Bug 3846] Use -Wno-format-truncation by default.
 +* [Bug 3851] Drop pool server when no local address can reach it.
 +             <hart@ntp.org>
+ * [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid.
+              <hart@ntp.org>
 +* [Bug 3849] ntpd --wait-sync times out. <hart@ntp.org>
 +* [Bug 3846] Use -Wno-format-truncation by default. <hart@ntp.org>
 +* [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access.
 +             <hart@ntp.org>
+ * [Bug 3842] Windows ntpd ppsapi DLL load failure crashes. <hart@ntp.org>
  * [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat
               Need to remove --Wformat-security when removing -Wformat to
               silence numerous libopts warnings.  <hart@ntp.org>