Merge branch 'maint-0.3.3' into maint-0.3.4

This commit is contained in:
Nick Mathewson 2018-11-11 18:05:45 -05:00
commit 1fce9d1296

View File

@ -1295,7 +1295,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime,
list = "P-256:P-224"; list = "P-256:P-224";
else else
list = "P-256:P-224"; list = "P-256:P-224";
int r = SSL_CTX_set1_groups_list(result->ctx, list); int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
if (r < 0) if (r < 0)
goto error; goto error;
} }