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

[arma at torproject.org]

commit 6837a270250a52ee1189cb17f00e29cfa3070e73
Merge: 33b8607 8bfa596
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Nov 10 21:51:31 2013 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 doc/tor.1.txt   |    5 +++--
 src/or/config.c |   22 +++++++++++-----------
 src/or/router.c |    4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)