commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)