[tor-commits] [tor/master] Merge remote-tracking branch 'github/ticket25952'

[nickm at torproject.org]

commit 5e0316142f14df890e34180dba087cd0264fba70
Merge: ed636de4c b396e4e42
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 11:59:53 2018 -0400

    Merge remote-tracking branch 'github/ticket25952'

 changes/ticket25952 |  9 ++++++
 src/or/main.c       | 89 ++++++++++++++++++++++++++++++-----------------------
 2 files changed, 60 insertions(+), 38 deletions(-)