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

[nickm at torproject.org]

commit a81581e6be5bc524429ebe513941006d00766e38
Merge: 732bbff29c 40eeb63b5e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 1 16:15:16 2021 -0500

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