commit 0bec65277abed5567458e94c05c2b94f1b84e460 Merge: 938ee9b 557f332 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 2 22:39:27 2013 -0400

Merge branch 'bug9880_fix' into maint-0.2.4

changes/bug9880 | 8 ++++++++ src/or/channel.c | 7 ++++++- src/or/channel.h | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-)