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

[nickm at torproject.org]

commit 9a34da97ce66d502582accd0622900ef33870e4a
Merge: 53ba344 2673b4b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:23:26 2016 -0500

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/buf-sentinel | 11 +++++++++++
 src/or/buffers.c     | 40 ++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 8 deletions(-)