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

[nickm at torproject.org]

commit 085bf61a351a6fce94046afe68a17eda0b133606
Merge: a2e500f1ff 1d11675adb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:37:34 2021 -0400

    Merge branch 'maint-0.4.6'

 changes/ticket40390             | 8 ++++++++
 src/lib/crypt_ops/crypto_rand.c | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)