diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-18 21:33:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-18 21:33:53 -0400 |
| commit | e35ca135282c6b833f51543988580bd860b49be6 (patch) | |
| tree | 32af651edb4c427729f808377a0726212a0948be /src/or/control.h | |
| parent | 06efbbb47ef28dd24cb4482f5b82204918891f41 (diff) | |
| parent | 0a9c17a61ad7193a051c53ea2a0cb91e012f014e (diff) | |
| download | tor-e35ca135282c6b833f51543988580bd860b49be6.tar.gz tor-e35ca135282c6b833f51543988580bd860b49be6.zip | |
Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4
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 0ea7941b13..61062da2c4 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -72,7 +72,7 @@ int control_event_server_status(int severity, const char *format, ...) CHECK_PRINTF(2,3); int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(smartlist_t *elements); +int control_event_conf_changed(const smartlist_t *elements); int control_event_buildtimeout_set(const circuit_build_times_t *cbt, buildtimeout_set_event_t type); int control_event_signal(uintptr_t signal); |