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

[nickm at torproject.org]

commit 768d54ea58ff6c44aa5ee4fa7b07ba6455daaf70
Merge: 6fff643a83 af5250b1df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 22 11:55:25 2021 -0500

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