commit eacaff6ccc8ea25859a1a9e14795bd4d4eac360f Merge: a5ed62f96 d2105ff5d Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 7 08:46:41 2018 -0400 Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2 changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)