commit 6c610117819a99eb33403be08ed7a11567ca65f9 Merge: 1b21d716ec 09b3af578d Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 17 08:22:44 2020 -0500 Merge remote-tracking branch 'tor-gitlab/mr/184' into master changes/bug33607 | 5 +++++ src/core/mainloop/connection.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-)