commit ae6ab63f242f9e1da446737d9293c2415365bbc2 Merge: 9c52846fe5 fe5a9db1e6 Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 13:14:26 2021 +0000

Merge branch 'maint-0.3.5' into release-0.3.5

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