Merge bk://maccarony/ntp-stable

into  pogo.udel.edu:/pogo/users/hart/ntp-stable-1325-1459

bk: 4be9063ejNQlNmcYUbPUdmW2AwBwLw

diff --cc ChangeLog
index 3aa579d043a7334b1762476d270273916f0d1a56,af5e9e35d6f20af6cdfe21893a17860f633e4408..c96367bf3194469727a9b505f989254b59f8191b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -6,12 -4,7 +6,13 @@@
    socket by default.  Provide a command-line 'socket name' option.
  * [Bug 1538] update refclock_nmea.c's call to getprotobyname().
  * [Bug 1541] Fix wrong keyword for "maxclock".
 +* [Bug 1552] update and complete broadcast and crypto features in sntp.
 +* [Bug 1553] sntp/configure.ac OpenSSL support.
 +* Escape unprintable characters in a refid in ntpq -p billboard.
 +* Simplify hash client code by providing OpenSSL EVP_*() API when built
 +  without OpenSSL.  (from ntp-dev)
 +* Do not depend on ASCII values for ('A' - '0'), ('a' - '0') in sntp.
+ * Windows compiling hints/winnt.html update from G. Sunil Tej.
  
  ---
  (4.2.6p2-RC2) 2010/04/27 Released by Harlan Stenn <stenn@ntp.org>