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

[nickm at torproject.org]

commit bcb8afe38e7a79cc3d9bffb3ffdcf772202aba43
Merge: 09a1a34ad1 c3ed4b2e56
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 28 11:18:30 2021 -0500

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