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

[nickm at torproject.org]

commit 70161785f94ee9e1571af4ec804bf57f877f40e8
Merge: af08dad6d 5aaecf6d0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 10:30:46 2020 -0400

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