[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.6'

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