[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit bbf304be26b5d677bb08d91e8c41a4ba478a1f63
Merge: 91f7771 a0f892f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 09:06:21 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

 changes/ticket15176 |    3 ++
 src/or/main.c       |  105 ++++++++++++++++++++++++++++++++-------------------
 2 files changed, 69 insertions(+), 39 deletions(-)