commit fba30b8b26a787b2e671b7d05f72449afc5a026a Merge: 411074501 c2fac2c6b Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 28 18:54:40 2017 -0400

Merge remote-tracking branch 'ahf-gitlab/bugs/23551'

src/common/buffers.c | 2 +- src/common/compress.c | 6 +++--- src/test/test_util.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-)