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

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

bk: 47048dc4xl-GHYU2Zx6WUIJ0nJDhJA

diff --cc ChangeLog
index 9f2418743dce24c48f4d694883f08f68652e1463,ea896a46a0af0370ad44fb55167025fd54fce1a2..68a314ba89520890ef0d17d50c8072820b859eed
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,10 @@@
- * [Bug 912] detect conflicting enable/disable configuration on interfaces sharing an IP address
 +* ntpd/ntp_timer.c: add missing sys_tai parameter for debug printf
 +* [Bug 917] config parse leaves files open
++* [Bug 912] detect conflicting enable/disable configuration on interfaces
++  sharing an IP address
 +* [Bug 771] compare scopeid if available for IPv6 addresses
+ * Lose obsolete crypto subcommands (Dave Mills).
+ * WWV is an HF source, not an LF source (Dave Mills).
  * [Bug 899] Only show -i/--jaildir -u/--user options if we HAVE_DROPROOT.
  * [Bug 916] 'cryptosw' is undefined if built without OpenSSL.
  * [Bug 891] 'restrict' config file keyword does not work (partial fix).