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

[nickm at torproject.org]

commit 0ace22ef6dcb918c74cdfadd90a21afe622f2921
Merge: da4dbb2 83dfcfb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 18 19:52:34 2016 -0500

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

 changes/bug18050 |    7 +++++++
 src/or/main.c    |   10 ++++++----
 src/or/router.c  |   13 +++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)