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

[nickm at torproject.org]

commit 67fdb1cd5574a974c05e48dede802eff71f8d80b
Merge: 2ae3148304 336c45f1a5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 15 13:00:20 2021 -0500

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