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.c | |
| parent | 06efbbb47ef28dd24cb4482f5b82204918891f41 (diff) | |
| parent | 0a9c17a61ad7193a051c53ea2a0cb91e012f014e (diff) | |
| download | tor-e35ca135282c6b833f51543988580bd860b49be6.tar tor-e35ca135282c6b833f51543988580bd860b49be6.tar.gz | |
Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 390b8d150..48782682c 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4393,7 +4393,7 @@ control_event_guard(const char *nickname, const char *digest, * a smartlist_t containing (key, value, ...) pairs in sequence. * <b>value</b> can be NULL. */ int -control_event_conf_changed(smartlist_t *elements) +control_event_conf_changed(const smartlist_t *elements) { int i; char *result; |