commit e402edd96064ae853767dff459da2646bc70af5e Merge: 960f62b 562c974 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 15 11:32:49 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/buffer_bug | 7 +++++++ src/or/buffers.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)