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

[nickm at torproject.org]

commit 57b1d0848e9b42670d6f33e37a2095740726e2b1
Merge: 3c8a4b8fb fe3d8ec38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 15:22:36 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1