Commit 132e2f69 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.2.8' into maint-0.2.9

parents fcaf3335 6f87a858
Loading
Loading
Loading
Loading

changes/bug23690

0 → 100644
+5 −0
Original line number Diff line number Diff line
  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.
+1 −0
Original line number Diff line number Diff line
@@ -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);