commit 4d1e39b21b961c574a8832d2698c66dc0f9614fa Merge: d579528 1df1143 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 17 14:51:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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