[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[arma at torproject.org]

commit bae5dd6c8d4535360d471932b87431f54b515567
Merge: 7d3fd85 96d3219
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 9 13:14:53 2013 -0400

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

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