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