commit 3e9409ef58139d557bb7e9bd7536896a88a5d6e9 Merge: e49d63a 783a44f Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 24 11:36:34 2015 -0500

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

changes/bug14950 | 3 +++ src/or/main.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)