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

[nickm@xxxxxxxxxxxxxx]

commit 4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d
Merge: 2949849 e61df2e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 13 10:31:02 2013 -0400

    Merge remote-tracking branch 'public/bug7912_squashed'

 changes/bug7912      |    8 +++
 src/or/channel.c     |   58 ++++++++++++++++---
 src/or/circuitlist.c |  150 ++++++++++++++++++++++++++++++++++++++++++++++----
 src/or/circuitlist.h |    5 ++
 src/or/circuitmux.c  |  135 +++++++++++++++++++++++++++++++++++++++++++--
 src/or/circuitmux.h  |    8 ++-
 src/or/or.h          |    7 +++
 src/or/relay.c       |   21 +++++--
 src/or/relay.h       |    2 +-
 9 files changed, 362 insertions(+), 32 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits