diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
| commit | b80a8bba199b9adfb9c893641ba770566fa548e1 (patch) | |
| tree | 2fba8dea9940d46863834f139ed350f7c0eaeffb /src/or/connection.c | |
| parent | 1ba1bdee4bd8f3c00e603fe9b0fd2f14eeb60466 (diff) | |
| parent | 1e69c60dccc358a7146c2b5e7825ea729498b41b (diff) | |
| download | tor-b80a8bba199b9adfb9c893641ba770566fa548e1.tar tor-b80a8bba199b9adfb9c893641ba770566fa548e1.tar.gz | |
Merge branch 'feature3049-v2' into maint-0.2.2
Conflicts:
src/common/Makefile.am
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 72414589c..4d3e89718 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -479,8 +479,7 @@ connection_free(connection_t *conn) } } if (conn->type == CONN_TYPE_CONTROL) { - TO_CONTROL_CONN(conn)->event_mask = 0; - control_update_global_event_mask(); + connection_control_closed(TO_CONTROL_CONN(conn)); } connection_unregister_events(conn); _connection_free(conn); |