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

[nickm at torproject.org]

commit fbd47a50783c79a553510091df09dce7632e02f6
Merge: 8851861ff0 5f009a59da
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 17 09:04:22 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40370            | 4 ++++
 src/core/mainloop/connection.c | 1 +
 2 files changed, 5 insertions(+)