commit 4da2864308efd3de7a3dcc857003fa4aea169be6 Merge: 0d946e1 3894ca1 Author: Andrea Shepard andrea@persephoneslair.org Date: Mon Oct 15 07:22:33 2012 -0700

Merge branch 'bug7087' of git://git.torproject.org/user/andrea/tor

src/or/channel.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)