commit 3f2cf1c0f5d027dad3d701fb264ee76300c626a2 Merge: 28dc7a519 e88863407 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 24 08:49:24 2018 -0400 Merge branch 'maint-0.3.1' into release-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(-)