Merge remote-tracking branch 'origin/master' into daemon-refactor-2

author Oto Šťáva <oto.stava@nic.cz>

Fri, 17 Mar 2023 11:21:47 +0000 (12:21 +0100)

committer Oto Šťáva <oto.stava@nic.cz>

Fri, 17 Mar 2023 11:21:47 +0000 (12:21 +0100)
author Oto Šťáva <oto.stava@nic.cz>
Fri, 17 Mar 2023 11:21:47 +0000 (12:21 +0100)
committer Oto Šťáva <oto.stava@nic.cz>
Fri, 17 Mar 2023 11:21:47 +0000 (12:21 +0100)
diff --cc daemon/engine.c
Simple merge
diff --cc daemon/tls.c
Simple merge
diff --cc daemon/tls_ephemeral_credentials.c
Simple merge
author	Oto Šťáva <oto.stava@nic.cz>
	Fri, 17 Mar 2023 11:21:47 +0000 (12:21 +0100)
committer	Oto Šťáva <oto.stava@nic.cz>
	Fri, 17 Mar 2023 11:21:47 +0000 (12:21 +0100)
		1	2
daemon/engine.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/tls.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/tls_ephemeral_credentials.c	patch \|	diff1 \|	diff2 \|	blob \| history