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

[nickm at torproject.org]

commit 2eb7673a8c9c370a8cc6eb86daea82baab4bc5d5
Merge: 487728341 20e278735
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 13:15:49 2020 -0400

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