diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:56:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:56:31 -0500 |
| commit | f7151387d937bd1113f4c694b170305d80dde9fa (patch) | |
| tree | d23b81da069ae0b085316fdcccf64f42e2c6e086 /src | |
| parent | bc1ea4f470734f7fa22949318a98e286da5cba49 (diff) | |
| parent | 1deda2106b0af16daaecc2e27982a28054e28345 (diff) | |
| download | tor-f7151387d937bd1113f4c694b170305d80dde9fa.tar.gz tor-f7151387d937bd1113f4c694b170305d80dde9fa.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.8
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 4fbbaf1abd..05e56c1a52 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -754,6 +754,10 @@ connection_close_immediate(connection_t *conn) connection_unregister_events(conn); + /* Prevent the event from getting unblocked. */ + conn->read_blocked_on_bw = + conn->write_blocked_on_bw = 0; + if (SOCKET_OK(conn->s)) tor_close_socket(conn->s); conn->s = TOR_INVALID_SOCKET; |