aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-06 13:52:54 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-06 13:52:54 -0500
commitcf2ac8e2556849fdcace74adf36da876f86af30a (patch)
tree84a0f7f21309374f148760d0c416c5ae49803575 /src/or/relay.h
parent6f7a8f84d906a0a9d5fd88e49d352bb748a36b09 (diff)
parent734ba5cb0a0b6cc5376f8889305835224d814252 (diff)
downloadtor-cf2ac8e2556849fdcace74adf36da876f86af30a.tar.gz
tor-cf2ac8e2556849fdcace74adf36da876f86af30a.zip
Merge remote-tracking branch 'public/feature11791'
Diffstat (limited to 'src/or/relay.h')
-rw-r--r--src/or/relay.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/relay.h b/src/or/relay.h
index df3edfbdb1..cdc2a9ae19 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -50,6 +50,8 @@ void clean_cell_pool(void);
void dump_cell_pool_usage(int severity);
size_t packed_cell_mem_cost(void);
+int have_been_under_memory_pressure(void);
+
/* For channeltls.c */
void packed_cell_free(packed_cell_t *cell);