commit e60d62e50d347c4db7356429835f52f502e5fa01 Merge: 6b828ced0f 9029444482 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:08:02 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

changes/ticket40073 | 3 +++ src/core/mainloop/connection.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)