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

[nickm at torproject.org]

commit 487728341977d0f82b09e99cff0ea1bb91cfc001
Merge: 5b6cd566b 3efd60474
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 10:32:20 2020 -0400

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