commit 5a8e902651001f20a00da7c78e69842ed13180c3 Merge: b077ccde4 f7151387d Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)