commit c928fb988a6679cc5aca380bcc568b165e5f7c4a Merge: 9666c620d 15cc41e66 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 13 11:13:18 2017 -0500 Merge branch 'ticket21953_029' into maint-0.2.9 changes/ticket21953 | 6 ++++++ src/or/main.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)