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

commit 03c7d9e992f250a484d4770af12271e742a3bd81 Merge: 5eff44c 9d07778 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 15 11:35:23 2011 -0500 Merge branch 'maint-0.2.1' into release-0.2.1 changes/buffer_bug | 7 +++++++ src/or/buffers.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)