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

commit 36b54fc6aa5f6ac0a765e9e3355ec5310a23233d Merge: 57d969de1a d66178c7b7 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 16 09:18:40 2021 -0400 Merge branch 'maint-0.4.5' "ours" to avoid version bump.