tor

commit 132e2f69b1068b139d3c114fddd6efe58d6fc8f4
parent fcaf3335b4916940a8033a3432bf2957c6927c0b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 23 Oct 2017 08:53:25 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

Diffstat:
A
changes/bug23690
 | 
5
+++++
M
src/or/circuitlist.c
 | 
1
+

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug23690 b/changes/bug23690
@@ -0,0 +1,5 @@
+  o Major bugfixes (relay, crash, assertion failure):
+    - Fix a timing-based assertion failure that could occur when the
+      circuit out-of-memory handler freed a connection's output buffer.
+      Fixes bug 23690; bugfix on 0.2.6.1-alpha.
+
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
@@ -1941,6 +1941,7 @@ single_conn_free_bytes(connection_t *conn)
   if (conn->outbuf) {
     result += buf_allocation(conn->outbuf);
     buf_clear(conn->outbuf);
+    conn->outbuf_flushlen = 0;
   }
   if (conn->type == CONN_TYPE_DIR) {
     dir_connection_t *dir_conn = TO_DIR_CONN(conn);