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

[nickm at torproject.org]

commit 407eb5d7cde6d03667ee4e555be69bf8e8924273
Merge: 2ddd45bdb8 aaf062119e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 28 08:05:00 2021 -0400

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