commit 18543c2c9b7b2a2b23b25b2e64262d60a5c448c5 Merge: 3bc580633 61c721f14 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 20 10:40:32 2017 -0500 Merge remote-tracking branch 'ffmancera/github/bug23271' changes/ticket23271 | 6 ++++++ src/or/main.c | 33 ++++++++++++++++++++------------- src/or/main.h | 2 ++ 3 files changed, 28 insertions(+), 13 deletions(-)