diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-04 11:26:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-04 11:26:33 -0400 |
| commit | db1c1dba34545c9b96f9ec4c01338caeaeeb0433 (patch) | |
| tree | 1d93a45b2f69e6377b17e670623aba26a6431625 /src/lib | |
| parent | 4aa02d3c7abe84e99874f6bf7bfffb7b551935a5 (diff) | |
| parent | 1710f4bbd6bb100901e7f601a1c0f96b51845f86 (diff) | |
| download | tor-db1c1dba34545c9b96f9ec4c01338caeaeeb0433.tar.gz tor-db1c1dba34545c9b96f9ec4c01338caeaeeb0433.zip | |
Merge branch 'bug30021_029' into bug30021_035
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index e702cb9dfa..80b0df301f 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -905,7 +905,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl, smartlist_free(elts); } done: - if (tor_tls) + if (tor_tls && peer_ciphers) return tor_tls->client_cipher_list_type = res; return res; |