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

[nickm at torproject.org]

commit 0957a5adb2d87a3a57a84b40ca9ddacb3e5eb6bd
Merge: 7b4716a762 26b257757b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 13 09:44:11 2020 -0400

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