Merge tl.davehart.net:C:/ntp/stable/3801

into  tl.davehart.net:C:/ntp/stable/3719-3801-3802

bk: 6415e3b3RtpRyz3AwUm_fuqtdBRGUA

diff --cc ChangeLog
index 29b4957c979cb515e6593590f33a9f6f21e0cc5d,5f055078a7d737c9eac66c2629bff8df862d9184..a62ab34c844e4a401c6c32c8a95ca9b5ad4a25bb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,9 @@@
  ---
+ * [Bug 3802] ntp-keygen -I default identity modulus bits too small for
+              OpenSSL 3.  Reported by rmsh1216@163.com <hart@ntp.org>
 +* [Bug 3801] gpsdjson refclock gps_open() device name mishandled. <hart@ntp.org>
 +* [Bug 3800] libopts-42.1.17 does not compile with Microsoft C. <hart@ntp.org>
 +* [Bug 3799] Enable libopts noreturn compiler advice for MSC. <hart@ntp.org>
  * [Bug 3797] Windows getaddrinfo w/AI_ADDRCONFIG fails for localhost when 
               disconnected, breaking ntpq and ntpdc. <hart@ntp.org>
  * [Bug 3795] pollskewlist documentation uses | when it shouldn't.

diff --cc configure.ac
Simple merge

diff --cc ntpdc/Makefile.am
Simple merge

diff --cc ntpq/Makefile.am
Simple merge

diff --cc sntp/Makefile.am
Simple merge

diff --cc util/Makefile.am
Simple merge