[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5

[nickm at torproject.org]

commit 72484a4953d744754b3b6b025242ef668e3f017a
Merge: aeafb7f44f f9bb49d870
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 13 14:20:27 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5

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