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

[nickm at torproject.org]

commit a1104a37a2c33a292d24724d3b0ab66d4c569468
Merge: eb224270d 9fcb3ef78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:46:45 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27461 | 5 +++++
 src/or/main.c    | 8 ++++++++
 2 files changed, 13 insertions(+)