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

[nickm at torproject.org]

commit bc6c37b202e907ed721adbfe2c08977416c0e61c
Merge: 113d18dc57 494ced690d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 17:14:01 2020 -0500

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