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

[nickm at torproject.org]

commit 78285594f51fc0009d3911fb894e12b793536a5d
Merge: 283ce30c5 0bb227d17
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 10:30:03 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.2
    
    `-s ours` to avoid version bump.