commit e3c2179f25aa3b2a310efb0b2d88214e79173eb5 Merge: a3a5e26212 c48d1c3f7c Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 13:14:26 2021 +0000

Merge branch 'maint-0.4.5' into maint-0.4.6

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