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

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

bk: 64c72c97oxZqg9W5Uvb4MtWvCfxsfA

diff --cc ChangeLog
index 439996b7a95a2062d6f4f461b749fd48a3f7d19b,b0cdccfe5d5dd721c9e729752ff42b796bd042ad..68a9e816682f49bfd8f2fc0dc66cb2c054285caa
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,9 @@@
  ---
  
- * [Bug 3846] Use -Wno-format-truncation by default. <hart@ntp.org>
 +* [Bug 3849] ntpd --wait-sync times out. <hart@ntp.org>
+ * [Bug 3846] Use -Wno-format-truncation by default.
+ * [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access.
+              <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>

diff --cc ntpd/ntp_proto.c
Simple merge