From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 17 Jan 2018 18:26:41 +0000 (-0500)
Subject: Merge branch 'bug22798_029_squashed'
X-Git-Tag: tor-0.3.3.1-alpha~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77026f8a87064efc926f0be1e65c922f5e4ea238;p=thirdparty%2Ftor.git

Merge branch 'bug22798_029_squashed'
---

77026f8a87064efc926f0be1e65c922f5e4ea238
diff --cc src/or/connection.c
index 3c37c59b40,dfb6d5bf16..a020bef775
--- 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 */