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

[nickm at torproject.org]

commit 2ae314830428e6b5f188884c1e2f747632496b65
Merge: e74fc69448 18db584caf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 15 09:55:17 2021 -0500

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