[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

[nickm at torproject.org]

commit 45d983049382e09d14d5047f9eef941d089e9fb7
Merge: 07f0210a05 72484a4953
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 13 14:20:39 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40099          | 4 ++++
 src/test/test_rendcache.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)