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

diff --cc ChangeLog
index 66237651fde635b521dd4b6d8dd8d13e15d255c1,f4a196aa57cd0dd8b3393a44cad0c0c35587d361..8a6c283fa536f96431692f686130b358d7ca7a4a
--- 1/ChangeLog
--- 2/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 d88fea9b232be14cf3f9d1c1db069c71e0eaea74,6040b23001f9c761447f5263f9ccdb4299446207..cfc460d47b03b79bb25067d1144b0b1d92170767
--- 1/scripts/update-leap/update-leap.html
--- 2/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>