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

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

bk: 64e57e93bUcl3xw22WynogPdQ84X9g

diff --cc ChangeLog
index aa7444bda81a54e8b9063c2ba0f1f87c4bb8f3d3,d1e84dea64682aef330f945d53004feba623c51a..3445452f3c864e5043e6618b143aad64a28c2d52
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,7 +1,12 @@@
  ---
  
 +* [Bug 3856] Enable Edit & Continue debugging with Visual Studio.
 +             <hart@ntp.org>
+ * [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid.
+              <hart@ntp.org>
 +* [Bug 3853] Clean up warnings with modern compilers. <hart@ntp.org>
 +* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as
 +             intended. <hart@ntp.org>
  * [Bug 3851] Drop pool server when no local address can reach it.
               <hart@ntp.org>
  * [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid.