commit 2878dad9dbc1e07f608fa3acddc76261e4d76648 Merge: df9858285 32d9d6935 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 3 13:31:26 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)