[tor-commits] [tor/master] Merge branch 'bug20081'

[nickm at torproject.org]

commit 4f4e995d4232e5c041011be4b087eb3332e70e21
Merge: b488bd5 20c4b01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 14 10:17:04 2016 -0400

    Merge branch 'bug20081'

 changes/bug20081        |  5 +++++
 src/or/buffers.c        |  5 ++++-
 src/or/buffers.h        |  1 +
 src/test/test_buffers.c | 22 ++++++++++++++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)