commit 3a364309ace5bc0b75b724484d6b27d84ec6a8b1 Merge: 057101581 95238eb91 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 17 08:35:52 2017 -0500 Merge branch 'bug24167_025' into maint-0.3.2 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)