commit c48d1c3f7c41c6d5c35aeda540fad013dbf83031 Merge: e7a8c3d127 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 maint-0.4.5

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