Merge branch 'maint-0.3.4'

This commit is contained in:
Nick Mathewson 2018-10-17 13:02:23 -04:00
commit b1891068f1
2 changed files with 7 additions and 1 deletions

6
changes/ticket28089 Normal file
View File

@ -0,0 +1,6 @@
o Major bugfixes (relay):
- When our write bandwidth limit is exhausted, stop writing on the
connection. Previously, we had a typo in the code that would make us stop
reading leading to relay connections being stuck indefinitely. Fixes bug
28089; bugfix on 0.3.4.1-alpha.

View File

@ -3308,7 +3308,7 @@ connection_write_bw_exhausted(connection_t *conn, bool is_global_bw)
{
(void)is_global_bw;
conn->write_blocked_on_bw = 1;
connection_stop_reading(conn);
connection_stop_writing(conn);
reenable_blocked_connection_schedule();
}