[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[nickm at torproject.org]

commit 562c974ee7913b09bc1b19e4674dea618f2c6328
Merge: 0582746 9d07778
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 15 11:28:44 2011 -0500

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

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