[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 69f66b960c61af0e2f26c5785c9bbd6a0c9b5f39
Merge: d8f5c5b 0bfaf86
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 15 10:44:17 2013 -0400

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

 changes/bug8879  |    5 +++++
 src/or/buffers.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)