summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-11-21 14:34:22 -0500
committerNick Mathewson <nickm@torproject.org>2010-11-21 14:34:22 -0500
commitcbd3745924defb812db56e727ce7ea039c9dc41e (patch)
tree35ee94654f6625bdbfa0f099e7bcbcffbcf054d7 /src/common
parent9cbe64db45de6d6f5f6adffda3586ca1e8d60d01 (diff)
parent2bd64f9e8f613a885ace601787fbbfde607810b6 (diff)
downloadtor-cbd3745924defb812db56e727ce7ea039c9dc41e.tar.gz
tor-cbd3745924defb812db56e727ce7ea039c9dc41e.zip
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/tortls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index c4b25007b5..f85c157bb8 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1054,7 +1054,7 @@ tor_tls_new(int sock, int isServer)
#ifdef SSL_set_tlsext_host_name
/* Browsers use the TLS hostname extension, so we should too. */
- {
+ if (!isServer) {
char *fake_hostname = crypto_random_hostname(4,25, "www.",".com");
SSL_set_tlsext_host_name(result->ssl, fake_hostname);
tor_free(fake_hostname);