[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit 94f478c84afddf3578ab39dfa5c8c1080934fc17
Merge: 3bf1d81a1 fcaf3335b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:47:58 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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