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

[nickm at torproject.org]

commit d47c9276de69ee206670844b4032965fbb497d3b
Merge: 3e64553f7 c99f220f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 4 14:34:38 2019 -0500

    Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4

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