[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug7691-rebased'

[nickm at torproject.org]

commit d357b97b6d7dcd98229218549245fcc3fcbee8f7
Merge: dab25eb d05ff31
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 13 21:48:33 2013 -0500

    Merge remote-tracking branch 'mikeperry/bug7691-rebased'

 changes/bug7341          |    7 ++
 src/or/circuitbuild.c    |  185 +++++++++++++++++++++++++++++++++++++++++++++-
 src/or/circuitbuild.h    |    3 +-
 src/or/circuitlist.c     |    8 ++-
 src/or/circuituse.c      |  169 +++++++++++++++++++++++++++++-------------
 src/or/connection_edge.c |    2 +-
 src/or/connection_edge.h |    1 +
 src/or/or.h              |   12 +++-
 src/or/relay.c           |   22 +++++-
 src/or/rendclient.c      |   35 +++++++++
 10 files changed, 384 insertions(+), 60 deletions(-)