commit 0f0dac0bfcfc357a87c3d275e9846bdfca946877 Merge: aaa5ca366 c4d0d9bd2 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 8 18:06:15 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)