aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-12-18 14:16:41 -0500
committerNick Mathewson <nickm@torproject.org>2009-12-18 14:16:41 -0500
commit7edae5898416dbd291d9e5e9f75e0b24153e73ea (patch)
tree36a53ab9ee4c2c5ebbaa9ae0301c8b3bf844beeb /src/or/connection.c
parentf711bc822156f07de92503e177fbde520f4b6335 (diff)
parent3a5a728d4a5490ac24819df54aca4a7d0dde0d10 (diff)
downloadtor-7edae5898416dbd291d9e5e9f75e0b24153e73ea.tar
tor-7edae5898416dbd291d9e5e9f75e0b24153e73ea.tar.gz
Merge commit 'karsten/fix-bridge-stats-master-4'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index fdbe86741..8de7ad9e5 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1375,7 +1375,7 @@ connection_proxy_connect(connection_t *conn, int type)
/* Send a SOCKS4 connect request with empty user id */
if (tor_addr_family(&conn->addr) != AF_INET) {
- log_warn(LD_NET, "SOCKS4 client is incompatible with with IPv6");
+ log_warn(LD_NET, "SOCKS4 client is incompatible with IPv6");
return -1;
}