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

[nickm at torproject.org]

commit 670f5632a54e5ae119e9d92eaebc583aab3fe0d1
Merge: 537be1da33 489d33e190
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 12 08:40:10 2020 -0400

    Merge branch 'maint-0.4.3' into maint-0.4.4
    
    "ours" merge to avoid MR 122 -- we already merged MR 123.