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

[nickm at torproject.org]

commit 956c61ec23e8e4861f852473292c2c54abb7f614
Merge: ec3df7c 8f857c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:19:18 2016 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 src/or/buffers.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)