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

[nickm at torproject.org]

commit f9f4c4ab1d37920eb76b024a1057a0b26ddb8377
Merge: e500ea2ea 7ba849349
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 10:31:16 2020 -0400

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