aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-23 08:53:14 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-23 08:53:14 -0400
commit6f87a85897ca82fac9fc132e0f0cf41eacab20d4 (patch)
treee2709e42d8dd689f7a41ae866f4c1f5c1604dcf3 /src
parent91c17ffbd61348e63cac81e90583f0b22b3c17d4 (diff)
parentf7222e6d8cf31ce0e2a4653477ab42645c045db6 (diff)
downloadtor-6f87a85897ca82fac9fc132e0f0cf41eacab20d4.tar.gz
tor-6f87a85897ca82fac9fc132e0f0cf41eacab20d4.zip
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitlist.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index d7dbfe5744..b710485908 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1939,6 +1939,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);