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

[nickm at torproject.org]

commit 56583f96e9a5cae0c8ee7c6fe94c2a01d7010ed2
Merge: 33380f6b27 f6b8894726
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 14 13:17:45 2020 -0400

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