commit 485990641ba765414a0e69ce7f2cc57f018c3bed Merge: e8a4482335 ea339227c2 Author: Alexander Færøy ahf@torproject.org Date: Fri Sep 18 14:51:54 2020 +0000

Merge remote-tracking branch 'tor-gitlab/mr/137'

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