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

diff --cc ChangeLog
index 096504f7ca677e385a3ca6b0e18a5495f43d51a8,bfaca440bae6a58b345819b5801b1c3895365036..89d8d5720d901da7fa3a08322c0f349d2bdd366d
--- 1/ChangeLog
--- 2/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>

diff --cc configure.ac
Simple merge

diff --cc include/ntp.h
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_crypto.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge

diff --cc sntp/configure.ac
Simple merge

diff --cc sntp/m4/ntp_libntp.m4
Simple merge