commit b13bf65062c5918e90cb72c622ef8bdc29d53c20 Merge: e220e6e43 3e68db02c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 3 09:10:58 2017 -0400 Merge branch 'bug23081_025' into maint-0.3.1 changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)