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