commit 2673b4b7a87bbdc880dd235f490dfb7b8f3c64c9 Merge: a9c8a5f b6227ed Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 20 18:23:19 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/buf-sentinel | 11 +++++++++++ src/or/buffers.c | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-)