diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:23:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:23:03 -0400 |
| commit | d3063da691d0006cf41f6406099f056ab47c543a (patch) | |
| tree | c44651600763ef302359589515e76dfb08cb56d4 /src/or/circuitlist.h | |
| parent | 9e45d940d466bcefcd1490fc2ae0e5a6298a846f (diff) | |
| parent | c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c (diff) | |
| download | tor-d3063da691d0006cf41f6406099f056ab47c543a.tar.gz tor-d3063da691d0006cf41f6406099f056ab47c543a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/config.c
src/or/relay.c
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 d67f80b065..874f68cd22 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -61,6 +61,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); #endif |