Merge bk://www.ntp.org/ntp-dev

into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 4681d38fnyKgqdapmAj6bMauWkX8cA

diff --cc ChangeLog
index 299b974e84ad66ad5227a4b421b3893689c41ca8,c2703fae805121a01c1156d153a5ca0960e1a5b0..5a9f2fd358274531325b27024599b7f7599b7597
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
- * Use emalloc() instead of malloc() in refclock_datum.c (Calypso).
 +* [Bug 863] unable to stop ntpd on Windows as the handle reference for events
 +            changed
+ * [Bug 858] recent leapfile changes broke non-OpenSSL builds.
+ * Use emalloc() instead of malloc() in refclock_datum.c (Calysto).
  * Start using 'design by contract' assertions.
+ * [Bug 767] Fast sync to refclocks wanted.
  * Allow null driftfile.
  * leap second infrastructure fixes from Dave Mills.
  * Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.