commit a0a4f8ae5d94a667ad431e487e08bc935a6989b5 Merge: 10ccb2b 931948a Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 1 09:21:34 2017 -0500 Merge remote-tracking branch 'asn/bug21586' changes/bug21586 | 4 ++++ src/or/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)