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 | cdee62da9e06dfc91a3100248bd9b8e82345347f (patch) | |
| tree | 12a58a09b6672b78a323d9fd0180692fafa1c256 /src | |
| parent | 04524443d071f3e310067e0a7ecdc52a97e80107 (diff) | |
| parent | da38904efbdd0c2c6b754aed7f75201e3c1cd97a (diff) | |
| download | tor-cdee62da9e06dfc91a3100248bd9b8e82345347f.tar.gz tor-cdee62da9e06dfc91a3100248bd9b8e82345347f.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
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 4e890497e9..192d705b5b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -761,6 +761,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; |