summaryrefslogtreecommitdiff
path: root/src/or/circuitlist.h
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/circuitlist.h
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/circuitlist.h')
-rw-r--r--src/or/circuitlist.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index e81c0785fe..d67f80b065 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -46,7 +46,7 @@ or_circuit_t *circuit_get_intro_point(const char *digest);
origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose,
extend_info_t *info, int flags);
void circuit_mark_all_unused_circs(void);
-void circuit_expire_all_dirty_circs(void);
+void circuit_mark_all_dirty_circs_as_unusable(void);
void circuit_mark_for_close_(circuit_t *circ, int reason,
int line, const char *file);
int circuit_get_cpath_len(origin_circuit_t *circ);