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

[nickm at torproject.org]

commit 2974c83735d2ac473fcffea0ff3b453e900d5854
Merge: 2613c98 0748c06
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 17 11:57:55 2013 -0400

    Merge remote-tracking branch 'public/bug9082'

 src/or/channel.c    |   37 +++++++++++++++++++++++++------------
 src/or/channel.h    |    4 ++++
 src/or/circuitmux.c |   25 +++++++++++++++++++++++++
 src/or/circuitmux.h |    2 ++
 4 files changed, 56 insertions(+), 12 deletions(-)