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

[nickm at torproject.org]

commit b3ca2faf46913fb6d1c334667e81de3570a7a177
Merge: 8b6e919086 1956f63d6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 7 13:30:36 2021 -0400

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