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

into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 4606ee78pBRX7OxWCIYhlUVxGlzYHg

diff --cc ChangeLog
index 16693a443ec0fcaee1904f9ca3c2cef21465fcaf,9252eec94a5fd97cafa49581440ac489b6479625..2ff266f1e5dc776c238bcaabea400690c651f836
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 789] Fix multicast client crypto authentication and make sure arriving
+           multicast packets do not disturb the autokey dance.
 +* [Bug 787] Bug fixes for 64-bit time_t on Windows.
  * [Bug 796] Clean up duplicate #defines in ntp_control.c.
  * [Bug 569] Use the correct precision for the Leitch CSD-5300.
  * [Bug 795] Moved declaration of variable to top of function.