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

[nickm at torproject.org]

commit d46f67ef0e840760494e3411a00d13c6a35e7427
Merge: 28ac17f43 633366efc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:58:12 2020 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug34078 | 5 +++++
 1 file changed, 5 insertions(+)