Merge branch 'maint-0.3.0' into maint-0.3.1

This commit is contained in:
Nick Mathewson 2017-10-23 08:53:25 -04:00
commit b68de63eb6
2 changed files with 6 additions and 0 deletions

5
changes/bug23690 Normal file
View File

@ -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.

View File

@ -2028,6 +2028,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);