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

[nickm at torproject.org]

commit 0db0c5c739dc06e1e4ec1b93f7e62922a1bacfc7
Merge: e4f2b52deb ce8d6d143c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 10 10:53:10 2021 -0400

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