commit 7e469c10020f92b6aa19cb3f4316fb040d837819 Merge: dca8ae5 4c1ecd7 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 14 19:10:20 2017 -0500

Merge branch 'bug20894_029_v3'

changes/bug20894 | 9 +++++++ src/common/util.c | 13 +++++++++ src/common/util.h | 1 + src/or/buffers.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- src/or/buffers.h | 5 ++++ src/test/test_buffers.c | 44 ++++++++++++++++++++++++++++++ src/test/test_util.c | 1 + 7 files changed, 132 insertions(+), 13 deletions(-)