[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1

[nickm at torproject.org]

commit e8886340762cbe3be306268dfe0003214b09ac07
Merge: 5c3639923 c3e40a836
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 08:49:20 2018 -0400

    Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1

 changes/bug23693.1 |  4 ++++
 src/or/config.c    | 10 +++++++++-
 src/or/main.c      |  2 +-
 src/or/router.c    | 21 ++++++++++++++-------
 4 files changed, 28 insertions(+), 9 deletions(-)