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

[nickm at torproject.org]

commit 8ada4263a95b2a5bc6ef6022664aadca14039d97
Merge: 9f59b6f458 1a0b5fd569
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 07:40:06 2021 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.4
    
    "ours" to avoid version bump.