aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-11 10:19:24 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-11 10:19:24 -0500
commit0e911abf27c7a7ede6dea81167c6e8b12b53174c (patch)
treebd97884dccbc6c5283e785bcb162f1b1cab6b08f /src/or/control.h
parent17113448d26f02576a2aabe8163ef5b65c810bae (diff)
downloadtor-0e911abf27c7a7ede6dea81167c6e8b12b53174c.tar.gz
tor-0e911abf27c7a7ede6dea81167c6e8b12b53174c.zip
Rename CIRC2 to CIRC_MINOR
Also give the arguments to control_event_circuit_status_minor real names.
Diffstat (limited to 'src/or/control.h')
-rw-r--r--src/or/control.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/control.h b/src/or/control.h
index e5d136b9fe..d7127f4ac0 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -37,9 +37,9 @@ 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_circuit_status_2(origin_circuit_t *circ,
- circuit_status_2_event_t e,
- int arg1, const void *arg2);
+int control_event_circuit_status_minor(origin_circuit_t *circ,
+ circuit_status_minor_event_t e,
+ int purpose, const struct timeval *tv);
int control_event_stream_status(entry_connection_t *conn,
stream_status_event_t e,
int reason);