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

[nickm at torproject.org]

commit 7915b651d9e926d829d2241a161c7afdaf0e7ffb
Merge: 34919368ce 45d9830493
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 13 14:20:39 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

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