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

[andrea at torproject.org]

commit 94a030990986e6c731141da3969aeae3ec0f5ea8
Merge: 7e4c91e ac227cf
Author: Andrea Shepard <andrea at torproject.org>
Date:   Mon Oct 15 13:04:55 2012 -0700

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

 src/or/channel.c    |   10 ++++++++++
 src/or/channeltls.c |   20 ++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)