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

[nickm at torproject.org]

commit fc6c0b46fb2741d58e4c8afc22800c76c304b0dc
Merge: 8ccefa7b7 b0ddaac07
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 29 10:29:40 2017 -0400

    Merge branch 'bug23690_additional_032'

 changes/bug23690_additional_032 | 4 ++++
 src/common/buffers.c            | 8 ++++++--
 src/common/buffers_tls.c        | 8 ++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)