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

[arma at torproject.org]

commit a4c641cce91acb673f81db2b6093fde425039eaf
Merge: 5c200d9 71c62b1
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jul 24 16:23:08 2014 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/ticket12688 |    6 ++++++
 doc/tor.1.txt       |    8 ++++++--
 src/or/config.c     |    5 +----
 src/or/entrynodes.c |   20 ++++++++++++++++----
 4 files changed, 29 insertions(+), 10 deletions(-)