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

commit e4e6418023dc2af7f3cb5480dbadbb6893bf82db Merge: b019c83853 26a07287a4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 28 11:20:08 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump(s)