commit 1e50b0e8844937515922f9a4f52b8feea574c206 Merge: 1a3f9f377 056003d60 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 7 08:46:45 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)