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

[nickm at torproject.org]

commit 66701c61951a13534b3e802e478270a5f04dbd15
Merge: f832b4bcee c80b98520b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 7 13:31:21 2021 -0400

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