commit a6de7341ddb977208836d6e13ab802a63ad5b128 Merge: 61f342380d e3c2179f25 Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 13:14:26 2021 +0000

Merge branch 'maint-0.4.6' into release-0.4.6

changes/bug40078 | 3 +++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)