[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11553_025'

[nickm at torproject.org]

commit 5a9ac0df99158f870f6cebc781337652b419cca9
Merge: 67aa368 17ad309
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 24 10:48:32 2014 -0400

    Merge remote-tracking branch 'public/bug11553_025'

 changes/bug11553      |   15 ++++++++++
 src/or/channel.c      |    4 +--
 src/or/channel.h      |    9 +++---
 src/or/circuitbuild.c |   75 +++++++++++++++++++++++++++++++++++++------------
 src/or/circuitlist.c  |   14 +++++++--
 src/or/connection.c   |    2 --
 6 files changed, 89 insertions(+), 30 deletions(-)