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

[nickm at torproject.org]

commit c547502ecbe3f9ddfcca90b5c70887e300493cc1
Merge: acbfc9c 6f20a74
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 16:15:39 2013 -0400

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

 changes/ticket8240  |    4 ++++
 doc/tor.1.txt       |    6 ++++++
 src/common/util.h   |   11 +++++++++++
 src/or/config.c     |    1 +
 src/or/confparse.c  |    2 ++
 src/or/entrynodes.c |   35 +++++++++++++++++++++++++++++++++--
 src/or/or.h         |    2 ++
 7 files changed, 59 insertions(+), 2 deletions(-)