commit e1c878731ee0b8afe6d012697bf4e6e3d9c8c40d Merge: 1dd0548d8 0f0dac0bf Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 8 18:06:15 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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