commit 3144e2ce2d07b6b19c7c553b8066081afef76f7a Merge: 2c5a2c6997 e0e0ef713e Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:08:01 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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