commit bf3a6643e1a14a4b0d2f65faf7c7ae4b5d11a5c3 Merge: 4012daacd c4d0d9bd2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 8 18:06:15 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)