commit a78504dbe62efac4a8f0ce03f3fb1123bde7c1dd Merge: a4930de5e 056003d60 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:46:45 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)