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

[arma at torproject.org]

commit 96d3219176398f377dc4a1c84e14a54e7d2516df
Merge: 39ac1db 00e2310
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 9 13:14:22 2013 -0400

    Merge branch 'bug8844_v2' into maint-0.2.3

 changes/bug8844  |    6 ++++++
 src/or/buffers.c |    3 ++-
 src/test/test.c  |   12 ++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)