From: NTP Release Engineering <stenn@ntp.org>
Date: Sat, 25 May 2024 09:21:14 +0000 (-0700)
Subject: Merge ntp-build.tal1.ntfo.org:/ntpbuild/data/master/ntp-stable
X-Git-Tag: NTP_4_3_105~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea59e550c974a11f38dae473f3724b346c3b9972;p=thirdparty%2Fntp.git

Merge ntp-build.tal1.ntfo.org:/ntpbuild/data/master/ntp-stable
into  ntp-build.tal1.ntfo.org:/ntpbuild/data/master/ntp-dev

bk: 6651ad8auPRYbb7zTo9PUraK_o6LiQ
---

ea59e550c974a11f38dae473f3724b346c3b9972
diff --cc ChangeLog
index 66237651f,f4a196aa5..8a6c283fa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,7 @@@
 +(4.3.104) 2024/05/21 Released by Harlan Stenn <stenn@ntp.org>
 +From ntp-4.2.8p18-RC1:
  ---
- (4.2.8p18-RC1) 2024/05/07 Released by Harlan Stenn <stenn@ntp.org>
+ (4.2.8p18) 2024/05/25 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Bug 3918] Tweak openssl header/library handling. <stenn@ntp.org>
  * [Bug 3914] Spurious "Unexpected origin timestamp" logged after time
diff --cc scripts/update-leap/update-leap.html
index d88fea9b2,6040b2300..cfc460d47
--- a/scripts/update-leap/update-leap.html
+++ b/scripts/update-leap/update-leap.html
@@@ -47,9 -47,9 +47,14 @@@ Previous: <a href="dir.html#Top" access
  </div>
  <h1 class="node-heading">Top</h1>
  
++<p>
++Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
++</div>
++<h1 class="node-heading">Top</h1>
++
  <p>This document describes the use of the NTP Project&rsquo;s <code>update-leap</code> program.
  </p>
- <p>This document applies to version 4.3.104 of <code>update-leap</code>.
+ <p>This document applies to version 4.2.8p18 of <code>update-leap</code>.
  </p>
  <span id="SEC_Overview"></span>
  <h2 class="shortcontents-heading">Short Table of Contents</h2>