diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-15 23:43:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-15 23:43:36 -0400 |
| commit | a856f446c7c95b338157511a55760575751544bc (patch) | |
| tree | ab41ef6eeebdaaf72299193d8fbfd4cc96e10480 /src/or/config.c | |
| parent | 6a77bde8d887bb9dd46c5c75e8bffb2f402feb39 (diff) | |
| parent | 561ca9b987e093755603f1cce8f7d783c7b3006e (diff) | |
| download | tor-a856f446c7c95b338157511a55760575751544bc.tar tor-a856f446c7c95b338157511a55760575751544bc.tar.gz | |
Merge commit 'sebastian/bug1831'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index ef2b2ddea..e65d1329c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4971,9 +4971,7 @@ or_state_set(or_state_t *new_state) tor_free(err); ret = -1; } - if (circuit_build_times_parse_state(&circ_times, global_state, &err) < 0) { - log_warn(LD_GENERAL,"%s",err); - tor_free(err); + if (circuit_build_times_parse_state(&circ_times, global_state) < 0) { ret = -1; } return ret; |