From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 3 Dec 2018 08:41:28 +0000 (-0500)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ac7273110d079ba87cfa17683d8487285b6d2fd;p=thirdparty%2Fntp.git

Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
into  psp-fb1.ntp.org:/a/etc/amd.net/nfs-stor0.ntfo.org/root/nfs/home/stenn/ntp-stable-3526

bk: 5c04ec38h2vKTpsKLZffRPkDW5_rhA
---

4ac7273110d079ba87cfa17683d8487285b6d2fd
diff --cc ChangeLog
index d33997215,0da56b835..0f8346ff6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,8 +1,10 @@@
  ---
+ (4.2.8p13)
+ 
 +* [Bug 3526] Incorrect poll interval in packet <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
+ * [Bug 3471] Check for openssl/[ch]mac.h.  <perlinger@ntp.org>
+   - added missing check, reported by Reinhard Max <perlinger@ntp.org>
  
  ---
  (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>