[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug6026' into maint-0.2.4

[arma at torproject.org]

commit f8bb0064d6a06770e6187ba57a2f4a764336aa84
Merge: cab5f82 07e2600
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 24 22:15:47 2013 -0400

    Merge remote-tracking branch 'public/bug6026' into maint-0.2.4

 changes/bug6026     |    4 ++++
 src/or/config.c     |    3 ++-
 src/or/connection.c |    5 ++++-
 src/or/router.c     |   31 ++++++++++++++++++++++++-------
 src/or/router.h     |    5 ++++-
 5 files changed, 38 insertions(+), 10 deletions(-)