summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-18 16:36:25 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-18 16:36:25 -0400
commit597cd893c557f8e05be98b6cade1b312fc6f0f8d (patch)
treee0739825eef13b029be94b06ea742d38f888aad4 /src/or/circuitbuild.c
parent01407f9718a7b1eb4e43b46c2799a390551aad29 (diff)
parent7bb51fdd89feb5ea3eb7e0a0b76c0dda0e50a82e (diff)
downloadtor-597cd893c557f8e05be98b6cade1b312fc6f0f8d.tar.gz
tor-597cd893c557f8e05be98b6cade1b312fc6f0f8d.zip
Merge remote-tracking branch 'public/bug6174' into maint-0.2.4
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index bb5b253c83..8e768e76f5 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -901,7 +901,7 @@ circuit_note_clock_jumped(int seconds_elapsed)
control_event_client_status(severity, "CIRCUIT_NOT_ESTABLISHED REASON=%s",
"CLOCK_JUMPED");
circuit_mark_all_unused_circs();
- circuit_expire_all_dirty_circs();
+ circuit_mark_all_dirty_circs_as_unusable();
}
/** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion