[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.3' into maint-0.2.4

[arma at torproject.org]

commit 288b3ec6035aad694942960f3b71693907f7e584
Merge: 0c3b365 0eec8e2
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 20 16:49:24 2014 -0400

    Merge branch 'maint-0.2.3' into maint-0.2.4

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