commit 2ae67fee4244ff3ea1e9f3345f2cfde48cf64435 Merge: 4a66c2d63 389ee834b Author: teor <teor@torproject.org> Date: Fri Apr 19 11:48:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5 changes/bug29144 | 5 +++++ src/core/mainloop/connection.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)