From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 30 Jun 2021 12:27:04 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: v7.0.0
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3c36d37df0521022c2d3e38be42b08fb86fec53e;p=nncp.git

Merge branch 'develop'
---

1cc0df98a8d949b9f8137081b875d98a1aae2e67