sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bug19903_028_v2' into maint-0.2.8

This commit is contained in:
Nick Mathewson 2016-08-19 19:35:26 -04:00
parent 459e5d705e 49843c980a
commit 65cf5130ef
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug19903 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Remove an inappropriate "inline" in tortls.c that was causing warnings
on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha.

2
src/common/tortls.c
View File

@ -143,7 +143,7 @@ tor_tls_allocate_tor_tls_object_ex_data_index(void)
/** Helper: given a SSL* pointer, return the tor_tls_t object using that
* pointer. */
STATIC inline tor_tls_t *
STATIC tor_tls_t *
tor_tls_get_by_ssl(const SSL *ssl)
{
tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);