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

[nickm at torproject.org]

commit 285dbeefa1b7e827df8dfa4a76a410330345c443
Merge: 7e600a74b 148291a52
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 15 16:45:25 2020 -0400

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