diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:13:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:13:57 -0400 |
| commit | 0cb01f5c971e497706b209c3fe75aedd089e3c8a (patch) | |
| tree | ce8a48e2255289d2c513dd1b7b8336f56dc9a37e /src/or/control.h | |
| parent | 8aad677bb7542376b053ecd12a0c6943e8cfa3c0 (diff) | |
| parent | 569fe936b8349082d6f9dcd4e55f7d5758d236be (diff) | |
| download | tor-0cb01f5c971e497706b209c3fe75aedd089e3c8a.tar.gz tor-0cb01f5c971e497706b209c3fe75aedd089e3c8a.zip | |
Merge remote-tracking branch 'public/split_entry_conn'
Conflicts:
src/or/connection.c
src/or/connection_edge.c
src/or/connection_edge.h
src/or/dnsserv.c
Some of these were a little tricky, since they touched code that
changed because of the prop171 fixes.
Diffstat (limited to 'src/or/control.h')
| -rw-r--r-- | src/or/control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.h b/src/or/control.h index 544a9fcc9e..0d9acd26ef 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -37,7 +37,7 @@ int control_event_is_interesting(int event); int control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t e, int reason); -int control_event_stream_status(edge_connection_t *conn, +int control_event_stream_status(entry_connection_t *conn, stream_status_event_t e, int reason); int control_event_or_conn_status(or_connection_t *conn, |