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

[nickm at torproject.org]

commit c2e265e4e578d4c662fa716b0cd472f24f5bf065
Merge: 010387e4bd 95914ceb57
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 27 08:33:26 2020 -0400

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