commit 8bcc14f62e620c4a15084449c335680096511001 Merge: 9c5ff56 85a2487 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 7 10:39:48 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug16248 | 8 ++++++++ src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 4 deletions(-)