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

[nickm at torproject.org]

commit 6e94d2fb3a11d7cba5796c1662e0c5089ad3e509
Merge: b0f7af1 597cd89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 16:36:52 2013 -0400

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

 changes/bug6174          |    6 ++++++
 src/or/circuitbuild.c    |    2 +-
 src/or/circuitlist.c     |   12 +++++-------
 src/or/circuitlist.h     |    2 +-
 src/or/circuituse.c      |   36 +++++++++++++++++++++++++++++++++---
 src/or/circuituse.h      |    1 +
 src/or/config.c          |    2 +-
 src/or/connection_edge.c |   18 ++++++------------
 src/or/main.c            |    4 ++--
 src/or/or.h              |    4 ++++
 src/or/relay.c           |    5 ++---
 11 files changed, 62 insertions(+), 30 deletions(-)