commit f81078527791b244c0200e53ac4862b36c21a1d9 Merge: 85526a5a1 d47c9276d Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 4 14:36:02 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27750 | 6 ++++++ src/or/main.c | 17 ++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-)