commit cdee62da9e06dfc91a3100248bd9b8e82345347f Merge: 04524443d da38904ef Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)