Merge branch 'bug22798_029_squashed'

diff --cc src/common/compat.h
Simple merge

diff --cc src/or/connection.c
index 3c37c59b40494e1a1c3193d17acbde9ea2f94710,dfb6d5bf169fc86702c5bfddcf56ee17f4f4c751..a020bef775e9dfa01486b68845492dc5419a07fb
--- 1/src/or/connection.c
--- 2/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 */