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

[nickm at torproject.org]

commit e2dd8f1532e0eb8ca6d6cbe9d588468482d14146
Merge: 7c00afe0fb 94fb308c5d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 16 09:18:06 2021 -0400

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