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

[nickm at torproject.org]

commit b70a0a01ec99064e23ccf56c7ff6d0bec397b2f7
Merge: dc06c07 6704e18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:37:22 2015 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug15083 |   10 ++++++++++
 src/or/buffers.c |   11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)