commit cd77ea782ede057c2086f25b3e2084c78dbde805 Merge: 46e8347 03b6cfd Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 11:01:36 2017 -0400

Merge branch 'neena-fix-1667'

changes/bug1667 | 4 +++ src/or/buffers.c | 82 +++++++++++++++++++++++++++++++++---------------- src/or/buffers.h | 3 ++ src/or/control.c | 41 +++++++++++++++++++++++++ src/test/test_buffers.c | 27 ++++++++++++++++ 5 files changed, 131 insertions(+), 26 deletions(-)