commit 77026f8a87064efc926f0be1e65c922f5e4ea238 Merge: 959af2024 57eab23ea Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 17 13:26:41 2018 -0500 Merge branch 'bug22798_029_squashed' changes/bug22798 | 4 ++++ src/common/compat.h | 3 +++ src/or/connection.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --cc src/or/connection.c index 3c37c59b4,dfb6d5bf1..a020bef77 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -3876,9 -3847,12 +3914,12 @@@ connection_handle_write_impl(connection /* else open, or closing */ initial_size = buf_datalen(conn->outbuf); - result = flush_buf_tls(or_conn->tls, conn->outbuf, + result = buf_flush_to_tls(conn->outbuf, or_conn->tls, max_to_write, &conn->outbuf_flushlen); + if (result >= 0) + update_send_buffer_size(conn->s); + /* If we just flushed the last bytes, tell the channel on the * or_conn to check if it needs to geoip_change_dirreq_state() */ /* XXXX move this to flushed_some or finished_flushing -NM */