commit 9fcb3ef787285fcb116d07fc2ff563e80a0c8a0e Merge: 912ae2b8d 8ef4bb7f3 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 7 08:46:35 2018 -0400 Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9 changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)