diff options
| author | Mike Perry <mikeperry-git@fscked.org> | 2012-10-25 17:43:10 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-07 10:34:09 -0500 |
| commit | 42e3c04a7a5fb47a97766e54c72885c5c2bf23a9 (patch) | |
| tree | 8152658f1006592a3b35d88e8fcf7d1c4ae9ad0f /src/or/control.c | |
| parent | bd93ff8dd76b06ca3afe1f362b086d4f12639f71 (diff) | |
| download | tor-42e3c04a7a5fb47a97766e54c72885c5c2bf23a9.tar.gz tor-42e3c04a7a5fb47a97766e54c72885c5c2bf23a9.zip | |
Bug 3443: Don't count ORconn setup in circuit build time.
Also, add a hack Roger suggested where we're more patient if no circuits are
opened yet.
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index 0b7f04adac..d935265d00 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3578,9 +3578,9 @@ control_event_circuit_status_minor(origin_circuit_t *circ, /* event_tail can currently be up to 130 chars long */ const char *hs_state_str = circuit_purpose_to_controller_hs_state_string(purpose); - const struct timeval *old_timestamp_created = tv; + const struct timeval *old_timestamp_began = tv; char tbuf[ISO_TIME_USEC_LEN+1]; - format_iso_time_nospace_usec(tbuf, old_timestamp_created); + format_iso_time_nospace_usec(tbuf, old_timestamp_began); tor_snprintf(event_tail, sizeof(event_tail), " OLD_PURPOSE=%s%s%s OLD_TIME_CREATED=%s", |