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

[nickm at torproject.org]

commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 14 11:46:20 2021 -0400

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