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

[nickm at torproject.org]

commit be9f0e5f20e37d2176ce0663b71b532c44c10c28
Merge: 319505d38 57f557747
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 11:57:09 2018 -0400

    Merge remote-tracking branch 'github/ticket25949'

 changes/ticket25949 |  9 +++++++++
 src/or/main.c       | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 11 deletions(-)