commit 17880e4c0a9670178d0722aea387c6885a28e69a Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 6 19:49:20 2011 -0500

Revert "Fix some wide lines in tortls.c"

This reverts commit e8dde3aabd3e1292d381eb4269c6457548dca6b9. --- src/common/tortls.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c index 9a77bab..4592514 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! */