[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1394'

[nickm at torproject.org]

commit 0d82a8be77ae8d7fb06c8702bfbf1ebbaf370c94
Merge: ab064cf76 ff304f3be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 9 16:44:12 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1394'

 changes/bug31939          | 3 +++
 src/lib/tls/buffers_tls.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)