diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-17 08:35:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-17 08:35:56 -0500 |
| commit | 368dc1003eeb58ad11e1eb13904ef7f79ef019d1 (patch) | |
| tree | a56b2d9655df5c8c408d75695d4ddd9d756b8f2d /src/or/connection.c | |
| parent | 4ef70ff389917f99cbee054bba78872b0b91a556 (diff) | |
| parent | 3a364309ace5bc0b75b724484d6b27d84ec6a8b1 (diff) | |
| download | tor-368dc1003eeb58ad11e1eb13904ef7f79ef019d1.tar.gz tor-368dc1003eeb58ad11e1eb13904ef7f79ef019d1.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/connection.c')
| -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 24f5a64622..92ccd3d5c8 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -768,6 +768,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; |