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

[nickm at torproject.org]

commit 2914d56ea4c767bbfa956afba64032c90a27f4eb
Merge: 121f4a9 6215ebb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 11 08:59:24 2014 -0400

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

 changes/bug13124 |    8 ++++++++
 src/or/config.c  |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)