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

[arma at torproject.org]

commit e170205cd8aae085687ca3b166bcc38b2134fc22
Merge: 6d6e21a 87576e8
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 20 16:51:17 2014 -0400

    Merge branch 'maint-0.2.5'

 changes/bug13100 |    3 +++
 src/or/config.c  |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)