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

[arma at torproject.org]

commit eb3e0e3da300f6c7c4e04386de872b4949a9baaf
Merge: bc9866e a57c07b
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jul 24 16:30:50 2014 -0400

    Merge branch 'maint-0.2.5'

 changes/ticket12690 |    9 +++++++++
 src/or/config.c     |    2 +-
 src/or/dirserv.c    |    5 +++--
 3 files changed, 13 insertions(+), 3 deletions(-)