commit c4d0d9bd24c484893055d50999377f86fd9468c7 Merge: 00536254b a67d153cc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 8 18:06:11 2018 -0400 Merge branch 'bug26948_033' into maint-0.3.3 changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)