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

[nickm at torproject.org]

commit eb6fc9f9bd89a02088af1cfa6fb4e39fe15ea9fc
Merge: 3efd60474 3517d2032
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 13:15:23 2020 -0400

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