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

[nickm at torproject.org]

commit f8aad4a5486b3adb53d07eb74e912f9c92d63b00
Merge: bf1635d8c b5731cdf2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 16 18:05:58 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/ticket27849 | 5 +++++
 src/or/main.c       | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)