[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9

[nickm at torproject.org]

commit fcaf3335b4916940a8033a3432bf2957c6927c0b
Merge: 68dea082e 3e68db02c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:47:52 2017 -0400

    Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9

 changes/bug23081 | 8 ++++++++
 src/or/ntmain.c  | 1 +
 2 files changed, 9 insertions(+)