commit 35574d4a9ad1ce0fb40d3c06493276a71990ac48 Merge: d29e4c059 fcaf3335b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 08:47:58 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)