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

commit 48ff6a41aed1e2b57f1766206324bc9dc33c19d1 Merge: 0b889e709 93d582b8e Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 16 19:39:03 2020 -0400 Merge branch 'maint-0.4.4' "ours" to avoid version bump.