Merge tl.davehart.net:C:/ntp/stable/tracking

into  tl.davehart.net:C:/ntp/stable/2990

bk: 64179612hJizq_tYwyS6GItdBrWrjw

diff --cc ChangeLog
index a62ab34c844e4a401c6c32c8a95ca9b5ad4a25bb,8675e47576f57650684738333e1f1657c75e0718..cdfd18bb16d836db751ffadeeaa492a2ab2583cc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -19,10 -14,10 +19,12 @@@
  * [Bug 3758] Provide a 'device' config statement for refclocks <perlinger@ntp.org> 
  * [Bug 3757] Improve handling of Linux-PPS in NTPD <perlinger@ntp.org>
  * [Bug 3741] 4.2.8p15 can't build with glibc 2.34 <perlinger@ntp.org>
+ * [Bug 3725] Make copyright of clk_wharton.c compatible with Debian.
+              Philippe De Muyter <phdm@macqel.be>
  * [Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows <perlinger@ntp.org>
    - openssl applink needed again for openSSL-1.1.1
 +* [Bug 3719] configure.ac checks for closefrom() and getdtablesize() missing.
 +             Reported by Brian Utterback, broken in 2010 by <hart@ntp.org>
  * [Bug 3699] Problems handling drift file and restoring previous drifts <perlinger@ntp.org>
    - command line options override config statements where applicable
    - make initial frequency settings idempotent and reversible
@@@ -66,7 -61,8 +68,9 @@@
    - applied patch by Gerry Garvey
  * [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
    - backport from -dev, plus some more work on warnings for unchecked results
 +* [Bug 3103] libopts zsave_warn format string too few arguments <bkorb@gnu.org>
+ * [Bug 2990] multicastclient incorrectly causes bind to broadcast address.
+              Integrated patch from Brian Utterback. <hart@ntp.org>
  * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
  * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
  * Use https in the AC_INIT URLs in configure.ac.  <stenn@ntp.org>

diff --cc ports/winnt/vs2015/ntpd/ntpd.vcxproj
Simple merge