[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

[nickm at torproject.org]

commit 6cc87bc269b0e2ebeb9e4ea1dd5c9df45bf53c4d
Merge: 9c8f7710e6 af6da4a36b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 10 10:55:00 2021 -0400

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