tor

commit 896d0ebb994cc0b1df2c9497fcf3afe55654d01f
parent 76ed869ff9b1e0b33b31ec22c6fd2957edb1ae45
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sun, 11 Nov 2018 18:05:45 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

Diffstat:
M
src/lib/tls/tortls_openssl.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c
@@ -650,7 +650,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime,
       list = "P-256:P-224";
     else
       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)
       goto error;
   }