From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 11 May 2010 07:33:33 +0000 (-0400)
Subject: Merge bk://maccarony/ntp-dev
X-Git-Tag: NTP_4_2_7P31~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ad66193d9c318daee9fd24d2960ee9f82d37bde;p=thirdparty%2Fntp.git

Merge bk://maccarony/ntp-dev
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1325-1459

bk: 4be9084ddLILNnj2VgqGYL71-5zJBw
---

7ad66193d9c318daee9fd24d2960ee9f82d37bde
diff --cc ChangeLog
index c780563a9,ef4da73fe..828a8561c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -264,12 -250,7 +264,13 @@@ mrulist
    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>