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

[nickm at torproject.org]

commit ea0a704d52a39873a42ef2770b2b0614252740d5
Merge: e93ff481f9 1770d1c216
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 17:47:02 2020 -0400

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