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

[nickm at torproject.org]

commit 2e02b597721ba640bbbf3082df99b6b7c60660c1
Merge: 056978c 39ef343
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:21:40 2016 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

 src/or/buffers.c | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)