commit e0e0ef713e96a196782fec754b11874675263c04 Merge: 84a5bd48e2 ea339227c2 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:07:53 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5

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