From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 16 Apr 2024 09:22:35 +0000 (-0500)
Subject: Merge stenn.chi1.ntfo.org:/home/nfs1.chi1/harlan/ntp-stable
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=1e04cd5025d6319c42efec273cf44409615bc507;p=thirdparty%2Fntp.git

Merge stenn.chi1.ntfo.org:/home/nfs1.chi1/harlan/ntp-stable
into  stenn.chi1.ntfo.org:/home/nfs1.chi1/harlan/ntp-stable-3909-13

bk: 661e435bA7YYFsDwwWS2f0lAFmWF0w
---

1e04cd5025d6319c42efec273cf44409615bc507
diff --cc ChangeLog
index 096504f7ca,bfaca440ba..89d8d5720d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
  ---
  
 +* [Bug 3914] Spurious "Unexpected origin timestamp" logged after time
 +             stepped. <hart@ntp.org>
+ * [Bug 3913] Avoid duplicate IPv6 link-local manycast associations.
+              <hart@ntp.org>
+ * [Bug 3909] Do not select multicast local address for unicast peer.
+              <hart@ntp.org>
  * [Bug 3903] lib/isc/win32/strerror.c NTstrerror() is not thread-safe.
               <hart@ntp.org>
  * [Bug 3901] LIB_GETBUF isn't thread-safe. <hart@ntp.org>