Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable

author Harlan Stenn <stenn@ntp.org>

Mon, 6 Mar 2023 07:13:07 +0000 (01:13 -0600)

committer Harlan Stenn <stenn@ntp.org>

Mon, 6 Mar 2023 07:13:07 +0000 (01:13 -0600)
author Harlan Stenn <stenn@ntp.org>
Mon, 6 Mar 2023 07:13:07 +0000 (01:13 -0600)
committer Harlan Stenn <stenn@ntp.org>
Mon, 6 Mar 2023 07:13:07 +0000 (01:13 -0600)
diff --cc ntpd/ntp_io.c
Simple merge
diff --cc ntpd/ntp_monitor.c
Simple merge
diff --cc ntpd/ntp_proto.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Mon, 6 Mar 2023 07:13:07 +0000 (01:13 -0600)
committer	Harlan Stenn <stenn@ntp.org>
	Mon, 6 Mar 2023 07:13:07 +0000 (01:13 -0600)
		1	2
ntpd/ntp_io.c	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_monitor.c	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_proto.c	patch \|	diff1 \|	diff2 \|	blob \| history