[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

[nickm at torproject.org]

commit b36f128cee5520ac37acafa0459c9bf14dedad5a
Merge: 17511b0dc a78504dbe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:46:45 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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