aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-11-21 14:33:11 -0500
committerNick Mathewson <nickm@torproject.org>2010-11-21 14:33:11 -0500
commit2bd64f9e8f613a885ace601787fbbfde607810b6 (patch)
treefa69f0845ce379809cc9c41364c1b6725bf79fcb /src
parenta33b338c5bf5e40037f465c0257a70dedb095e82 (diff)
parenta9d2148f53aed97d060498e13ca1597a28bc47c7 (diff)
downloadtor-2bd64f9e8f613a885ace601787fbbfde607810b6.tar
tor-2bd64f9e8f613a885ace601787fbbfde607810b6.tar.gz
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src')
-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 1bb3b8b35..fa89412f6 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1027,7 +1027,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);