diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:16:47 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:16:47 -0400 |
commit | c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c (patch) | |
tree | 9b3ba35e86f2eedbc3e87ac9348c73d951958223 /src/or/circuitlist.h | |
parent | dc516a543604e081583cbe725bc4b0a89768fc78 (diff) | |
parent | 2e1fe1fcf93c2a77805048bea5c535ca4456d583 (diff) | |
download | tor-c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c.tar.gz tor-c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c.zip |
Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3
Diffstat (limited to 'src/or/circuitlist.h')
-rw-r--r-- | src/or/circuitlist.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 6e7735476b..44f0c1fe3b 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -57,6 +57,7 @@ int circuit_count_pending_on_or_conn(or_connection_t *or_conn); 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); #endif |