[tor-commits] [tor/master] Merge branch 'bug24584'

[nickm at torproject.org]

commit d0adf5ae952d303dcd1d6ff06e523580c8055ece
Merge: 7a6060041 f205dabf7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 11 12:28:29 2018 -0500

    Merge branch 'bug24584'

 changes/bug24584 |  5 +++++
 src/or/main.c    | 22 ++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)