commit 9be7608fda470713c4b9cd39a55f482706311717 Merge: 192c7c8bf 6182f60f7 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 08:51:58 2018 -0400

Merge branch 'maint-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(-)