Merge branch 'master' into httpproto

author Joey Hess <joeyh@joeyh.name>

Sun, 7 Jul 2024 16:08:24 +0000 (12:08 -0400)

committer Joey Hess <joeyh@joeyh.name>

Sun, 7 Jul 2024 16:08:24 +0000 (12:08 -0400)
author Joey Hess <joeyh@joeyh.name>
Sun, 7 Jul 2024 16:08:24 +0000 (12:08 -0400)
committer Joey Hess <joeyh@joeyh.name>
Sun, 7 Jul 2024 16:08:24 +0000 (12:08 -0400)
diff --cc doc/design/p2p_protocol_over_http/draft1.mdwn
Simple merge
author	Joey Hess <joeyh@joeyh.name>
	Sun, 7 Jul 2024 16:08:24 +0000 (12:08 -0400)
committer	Joey Hess <joeyh@joeyh.name>
	Sun, 7 Jul 2024 16:08:24 +0000 (12:08 -0400)