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

[nickm at torproject.org]

commit 7c00afe0fbddd552f4e04e1ad37b1bdae6daf330
Merge: 61731e3550 f2cfd1ffad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 09:41:38 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5