summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-04-23 19:46:29 -0400
committerRoger Dingledine <arma@torproject.org>2010-04-23 19:46:29 -0400
commitb3019c6d2b0314042dfffade021497db51e4964a (patch)
tree70ea163b4f88d46029e2d3869758bfa15ec03359 /src/or/or.h
parent45ab6959c9b77ffbc03ff6b7515f1c7d0af35d45 (diff)
parentb2641920835b046ae820c608136dfbef1a557fb0 (diff)
downloadtor-b3019c6d2b0314042dfffade021497db51e4964a.tar.gz
tor-b3019c6d2b0314042dfffade021497db51e4964a.zip
Merge branch 'maint-0.2.1'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 46885482a8..9c613d28d1 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3230,6 +3230,8 @@ int circuit_conforms_to_options(const origin_circuit_t *circ,
void circuit_build_needed_circs(time_t now);
void circuit_detach_stream(circuit_t *circ, edge_connection_t *conn);
+void circuit_expire_old_circuits_serverside(time_t now);
+
void reset_bandwidth_test(void);
int circuit_enough_testing_circs(void);