commit 7c19a4d924120f42c224ea357b388b73d05c2d89 Merge: 57a41348ee 7fdfc2ea54 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 10 08:37:26 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.4

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