aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitlist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-06-18 10:25:30 -0400
committerNick Mathewson <nickm@torproject.org>2013-06-18 10:25:30 -0400
commitb5d1fded3dfa836ef1f45f6acb74971f75d5caa9 (patch)
treece22de55ffa508033064f7e6165590c00028f459 /src/or/circuitlist.h
parent2974c83735d2ac473fcffea0ff3b453e900d5854 (diff)
parentefa342f5fa2c6700ed8273557b7fb39bdc577120 (diff)
downloadtor-b5d1fded3dfa836ef1f45f6acb74971f75d5caa9.tar.gz
tor-b5d1fded3dfa836ef1f45f6acb74971f75d5caa9.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/circuitlist.h')
-rw-r--r--src/or/circuitlist.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index 94887d5faf..03f678c5af 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -63,6 +63,7 @@ int circuit_count_pending_on_channel(channel_t *chan);
void assert_cpath_layer_ok(const crypt_path_t *cp);
void assert_circuit_ok(const circuit_t *c);
void circuit_free_all(void);
+void circuits_handle_oom(size_t current_allocation);
void channel_note_destroy_pending(channel_t *chan, circid_t id);
void channel_note_destroy_not_pending(channel_t *chan, circid_t id);