summaryrefslogtreecommitdiff
path: root/src/common/tortls.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-05-20 15:33:22 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-20 15:33:22 -0400
commited02a409cfdd51671ff1d80c86cfc7d6458f201f (patch)
tree527aeae3937418ca204426b682d7efd61c0ad57b /src/common/tortls.h
parent32bd533ddac5bd7d594a81119449b3d30206eedd (diff)
parente9677c8f8d3a24bc572d63dd85fa14e8d596ad78 (diff)
downloadtor-ed02a409cfdd51671ff1d80c86cfc7d6458f201f.tar.gz
tor-ed02a409cfdd51671ff1d80c86cfc7d6458f201f.zip
Merge branch 'bug16034_no_more_openssl_098_squashed'
Conflicts: src/test/testing_common.c
Diffstat (limited to 'src/common/tortls.h')
-rw-r--r--src/common/tortls.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 2aac8af18e..083052f4b2 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -92,7 +92,7 @@ size_t tor_tls_get_forced_write_size(tor_tls_t *tls);
void tor_tls_get_n_raw_bytes(tor_tls_t *tls,
size_t *n_read, size_t *n_written);
-void tor_tls_get_buffer_sizes(tor_tls_t *tls,
+int tor_tls_get_buffer_sizes(tor_tls_t *tls,
size_t *rbuf_capacity, size_t *rbuf_bytes,
size_t *wbuf_capacity, size_t *wbuf_bytes);