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

[nickm at torproject.org]

commit 42c0358ceb2b030e9b9f751ad02ddd82b5912038
Merge: 7ba849349 49b4d1765
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 13:14:58 2020 -0400

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