[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 1a7488106326d2327fc24f32b13979b7029b813b
Merge: eae0c00 1df1143
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 17 14:51:45 2016 -0400

    Merge branch 'maint-0.2.8'

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