[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit 08fca9414d22a2a0c363e1249b1a0b2908fe10eb
Merge: 5807656f8 6182f60f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 08:51:58 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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