[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 566645b5edb25aec55e6dffaf6f522456f661a9e
Merge: e65b54e 0bec652
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 2 22:40:01 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

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