summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-03-17 02:48:21 +0000
committerNick Mathewson <nickm@torproject.org>2008-03-17 02:48:21 +0000
commita8d72cdfff39167c6f1cd877dfdd0199cd5c1e01 (patch)
tree3b5dfc020d96d245df967ba9a9df82c8183e2b14
parenta1b8b1bf12217a1878c0313be262dc787cc02c68 (diff)
downloadtor-a8d72cdfff39167c6f1cd877dfdd0199cd5c1e01.tar.gz
tor-a8d72cdfff39167c6f1cd877dfdd0199cd5c1e01.zip
r18853@catbus: nickm | 2008-03-16 22:47:25 -0400
Backport: Downgrade "sslv3 alert handshake failure" message to info. svn:r14060
-rw-r--r--ChangeLog3
-rw-r--r--src/common/tortls.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 85ec25c971..02f444f69a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ Changes in version 0.2.0.22-rc - 2008-03-??
patterns will no longer work. This means Tor works in certain
censored countries by default again.
+ o Minor features:
+ - Downgrade "sslv3 alert handshake failure" message to INFO.
+
o Minor bugfixes:
- If we set RelayBandwidthRate and RelayBandwidthBurst very high but
left BandwidthRate and BandwidthBurst at the default, we would be
diff --git a/src/common/tortls.c b/src/common/tortls.c
index d15e93ce63..4e254c3ada 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1003,7 +1003,7 @@ tor_tls_renegotiate(tor_tls_t *tls)
return TOR_TLS_DONE;
} else
return tor_tls_get_error(tls, r, CATCH_SYSCALL|CATCH_ZERO,
- "renegotiating handshake", LOG_WARN);
+ "renegotiating handshake", LOG_INFO);
}
/** Shut down an open tls connection <b>tls</b>. When finished, returns