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

Revert "Don't schedule excess_renegotiations_callback unless it's set"

This reverts commit 617617e21a2d30a86cea9c8f7043333078f2e8f8. --- src/common/tortls.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c index 9ac5c34..9a77bab 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1333,8 +1333,7 @@ tor_tls_got_client_hello(tor_tls_t *tls) }

tls->got_renegotiate = 1; - } else if (tls->server_handshake_count > 2 && - tls->excess_renegotiations_callback) { + } else if (tls->server_handshake_count > 2) { /* We got more than one renegotiation requests. The Tor protocol needs just one renegotiation; more than that probably means They are trying to DoS us and we have to stop them. We can't