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

[nickm at torproject.org]

commit a87f22ef6499818c1ff32f30c66e2e18d1e80ddf
Merge: 63a42b3 5c5198e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 20 14:26:22 2013 -0400

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

 changes/bug8408     |    4 ++++
 doc/tor.1.txt       |    5 +++++
 src/or/circuituse.c |    1 +
 src/or/config.c     |    2 ++
 src/or/dirserv.c    |   13 +++++++++++--
 src/or/or.h         |    6 ++++++
 6 files changed, 29 insertions(+), 2 deletions(-)