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

[nickm at torproject.org]

commit 1850ac46973541c3d30ecd7a42faa7f5be573a4a
Merge: d5257ad06 b2ce815bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 29 13:56:16 2020 -0400

    Merge branch 'maint-0.4.4' into release-0.4.4