summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
commit17880e4c0a9670178d0722aea387c6885a28e69a (patch)
tree5dc68a998962fa883e5c5f3a1fcdf0f54ddd7571
parente83e720c8bf1f97c3df2ed272296f6dbcc4b8c24 (diff)
downloadtor-17880e4c0a9670178d0722aea387c6885a28e69a.tar.gz
tor-17880e4c0a9670178d0722aea387c6885a28e69a.zip
Revert "Fix some wide lines in tortls.c"
This reverts commit e8dde3aabd3e1292d381eb4269c6457548dca6b9.
-rw-r--r--src/common/tortls.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 9a77bab09c..459251488c 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1343,8 +1343,7 @@ tor_tls_got_client_hello(tor_tls_t *tls)
if (tor_run_in_libevent_loop(tls->excess_renegotiations_callback,
tls->callback_arg) < 0) {
- log_warn(LD_GENERAL, "Didn't manage to set a renegotiation "
- "limiting callback.");
+ log_warn(LD_GENERAL, "Didn't manage to set a renegotiation limiting callback.");
}
}
@@ -1399,6 +1398,7 @@ tor_tls_state_changed_callback(const SSL *ssl, int type, int val)
tor_tls_got_client_hello(tls);
}
#endif
+
}
/** Replace *<b>ciphers</b> with a new list of SSL ciphersuites: specifically,
@@ -1666,8 +1666,8 @@ tor_tls_read(tor_tls_t *tls, char *cp, size_t len)
#ifdef V2_HANDSHAKE_SERVER
if (tls->got_renegotiate) {
if (tls->server_handshake_count != 2) {
- log_warn(LD_BUG, "We did not notice renegotiation in a timely "
- "fashion (%u)!", tls->server_handshake_count);
+ log_warn(LD_BUG, "We did not notice renegotiation in a timely fashion (%u)!",
+ tls->server_handshake_count);
}
/* Renegotiation happened! */