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

[nickm at torproject.org]

commit daf79d4b2a5f46ae4ffbdee7b39c504ccce33d6c
Merge: 2744f295a 2420e84ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 21 15:42:57 2018 -0500

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/ticket28912 |  6 ++++++
 src/or/main.c       | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)