[tor-commits] [tor/release-0.2.4] Merge branch 'bug7350_redux' into maint-0.2.4

[arma at torproject.org]

commit f1caa2f2146ac750962e6506fe672b03749c50f9
Merge: 323cb65 ca50fb4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 16:43:00 2013 -0400

    Merge branch 'bug7350_redux' into maint-0.2.4

 changes/bug7350  |    4 ++++
 src/or/channel.c |   24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)