Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1757

bk: 4d0fc77cpGhzwAwzBsAeJCtBxG84jg

diff --cc ChangeLog
index daf62709ccd1d540bf909a04821f4def7802829a,55ef60b2dc1af9eba88616dcefc0c11c442b3dc7..944f4b10723cfdb09ae9d92973f115a1470f2e80
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -10,8 -11,10 +11,11 @@@
    local timezone.
  * [Bug 1751] Support for Atari FreeMiNT OS.
  * [Bug 1754] --version output should be more verbose.
- * Upgrade to libopts 33.5.8 from AutoGen 5.11.6pre3.
 +* [Bug 1757] oncore snprintf("%m") doesn't expand %m.
+ * [Bug 1758] setsockopt IPV6_MULTICAST_IF with wrong ifindex.
+ * [Bug 1760] ntpd Windows interpolation cannot be disabled.
+ * [Bug 1762] manycastclient solicitation responses interfere.
+ * Upgrade to libopts 34.0.9 from AutoGen 5.11.6pre5.
  * Suppress ntp-keygen OpenSSL version display for --help, --version,
    display both build and runtime OpenSSL versions when they differ.
  * Clean up m4 quoting in configure.ac, *.m4 files, resolving

diff --cc ntpd/ntp_io.c
Simple merge