aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@fscked.org>2012-12-07 18:57:51 -0800
committerMike Perry <mikeperry-git@fscked.org>2013-01-08 17:21:05 -0800
commit3458d904f62b2d97dce5fea6f85285ea34851724 (patch)
tree18ac1a9167bd5b30490788f40b6894fe536a1871 /src/or/circuitbuild.c
parentdffc8e359bcfeb00813a3afde6aa2328f6a6a476 (diff)
downloadtor-3458d904f62b2d97dce5fea6f85285ea34851724.tar
tor-3458d904f62b2d97dce5fea6f85285ea34851724.tar.gz
Fix bug 7341.
Fix cannibalize, rend circ and intro circ timeout handling.
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 12d6ea357..7d94b2bb1 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2567,6 +2567,9 @@ circuit_extend_to_new_exit(origin_circuit_t *circ, extend_info_t *exit)
{
int err_reason = 0;
warn_if_last_router_excluded(circ, exit);
+
+ tor_gettimeofday(&circ->base_.timestamp_began);
+
circuit_append_new_exit(circ, exit);
circuit_set_state(TO_CIRCUIT(circ), CIRCUIT_STATE_BUILDING);
if ((err_reason = circuit_send_next_onion_skin(circ))<0) {