[tor-commits] [tor/master] Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor

[andrea at torproject.org]

commit 9f3f5372b880b3372fd7b9fc98bd3d78f969390a
Merge: cd054ce 3b270e8
Author: Andrea Shepard <andrea at torproject.org>
Date:   Wed Nov 7 11:43:04 2012 -0800

    Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor

 changes/bug7350      |    5 +++++
 src/or/channel.c     |   32 ++++++++++++++++++++++----------
 src/or/circuitlist.c |   14 ++++++++++++--
 3 files changed, 39 insertions(+), 12 deletions(-)