Merge ntp-build.tal1.ntfo.org:/home/localhost/u1/ntpreleng/ntp-stable

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

bk: 6763f6943_jgiXmcqvFre3jLIDYbzw

diff --cc ChangeLog
index a07835d643f626296c4ee2fc620afd950338343a,ac5c8fb7c7c706a8647882ab5782e408df240448..4cabc1d394f4a0b2bf944181e93937164b96ce7d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,11 @@@
+ ---
+ * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
+              Ulrich Windl. <stenn@ntp.org>
  * Makefile.am: Fix distcheck problem with check-local.  <stenn@ntp.org>
  * Add .github to the top-level tree. <dlavigne@nwtime.org>
 +      
 +(4.3.106) 2024/11/28 Released by Harlan Stenn <stenn@ntp.org>
 +
  * build script: Use hostname.site for NTF build hosts.  Use the full
    hostname for the buildkey.  <stenn@ntp.org>
  * flock-build: Try to use the full hostname for the buildkey.  <stenn@ntp.org>