[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit a8a26ca30eae38fb47dd06392a65a8e8291ec2d0
Merge: ab3826f 7e7683b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 15 13:56:53 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17354 |    4 ++++
 src/or/main.c    |    1 +
 2 files changed, 5 insertions(+)