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

[nickm at torproject.org]

commit 2c70ca0e944a086d03b92d978c957a5de90d00c8
Merge: ed46539 562c974
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 15 11:38:40 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/buffer_bug |    7 +++++++
 src/or/buffers.c   |    5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)