[tor-commits] [tor/main] Merge branch 'maint-0.4.6' into main

[ahf at torproject.org]

commit ac254d53344a8be7407b15ea8dfdbd412953d84c
Merge: 5ab108360d e3c2179f25
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Aug 11 13:14:26 2021 +0000

    Merge branch 'maint-0.4.6' into main

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