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

[nickm at torproject.org]

commit 3630649b7900c8b98c12b6b147b99b5b33ba58ec
Merge: 086f01e224 fbd47a5078
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 17 09:04:22 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

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