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