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

commit 89e3028590e4fbe7cbe0948e1533bcb3c1183d6a Merge: 93af8b1ad8 8142b368e7 Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 7 09:42:39 2021 -0400 Merge branch 'maint-0.4.6' "ours" merge to avoid version bump.