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

[nickm at torproject.org]

commit b30ac328c5a07aaa4a806af3314b48d10082448a
Merge: 9e2435c25f bf5bf33661
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 15 08:52:45 2020 -0400

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