summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-03-26 01:45:35 +0000
committerRoger Dingledine <arma@torproject.org>2008-03-26 01:45:35 +0000
commit55b28335280cd4fba676a1fb9a71238d61eb76e4 (patch)
tree0d2a53680521e410c99b1a33b51379aa1590394c
parenta6246d2a204f69e329073885bf63610a66e7c9d8 (diff)
downloadtor-55b28335280cd4fba676a1fb9a71238d61eb76e4.tar.gz
tor-55b28335280cd4fba676a1fb9a71238d61eb76e4.zip
backport r14165
svn:r14187
-rw-r--r--src/common/tortls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index f673846c83..7ad1507218 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -622,7 +622,7 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime)
#ifdef V2_HANDSHAKE_SERVER
/** Return true iff the cipher list suggested by the client for <b>ssl</b> is
- * a list that indicates that the client know how to do the v2 TLS connection
+ * a list that indicates that the client knows how to do the v2 TLS connection
* handshake. */
static int
tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address)
@@ -666,7 +666,7 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address)
}
s = smartlist_join_strings(elts, ":", 0, NULL);
log_info(LD_NET, "Got a non-version-1 cipher list from %s. It is: '%s'",
- s, address);
+ address, s);
tor_free(s);
smartlist_free(elts);
}