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

[nickm at torproject.org]

commit 4235425fce7f3c1feeba8e7b41b7e2e3372bda9a
Merge: 62ef02a 301faf2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Mar 10 19:53:31 2013 -0400

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

 src/or/channel.c         |    8 +++---
 src/or/circuitbuild.c    |    2 +-
 src/or/circuitlist.c     |   30 +++++++++++-----------
 src/or/circuitmux.c      |   22 ++++++++--------
 src/or/circuituse.c      |   61 ++++++++++++++++++++++++----------------------
 src/or/command.c         |   34 +++++++++++++------------
 src/or/connection_edge.c |   12 ++++----
 src/or/connection_or.c   |    1 -
 src/or/cpuworker.c       |    5 +--
 src/or/rendclient.c      |   12 ++++----
 src/or/rendmid.c         |   58 ++++++++++++++++++++++----------------------
 src/or/rendservice.c     |   54 ++++++++++++++++++++++------------------
 12 files changed, 154 insertions(+), 145 deletions(-)