[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug3589'

[nickm at torproject.org]

commit ec8bdc5da81a27fd0d382db689addd8114347e1e
Merge: f9478b7 8b9f4d7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 12:05:08 2012 -0400

    Merge remote-tracking branch 'asn/bug3589'

 changes/bug3589       |    3 +
 src/or/circuitbuild.c |  196 --------------------------
 src/or/circuitbuild.h |   28 +----
 src/or/connection.c   |    1 +
 src/or/router.c       |    8 +
 src/or/transports.c   |  373 ++++++++++++++++++++++++++++++++++++++++++-------
 src/or/transports.h   |   49 ++++---
 7 files changed, 360 insertions(+), 298 deletions(-)