Merge branch 'vectorclock'
authorJoey Hess <joeyh@joeyh.name>
Wed, 4 Aug 2021 16:39:54 +0000 (12:39 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 4 Aug 2021 16:39:54 +0000 (12:39 -0400)

Trivial merge