summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2009-12-18 12:55:05 +0100
committerKarsten Loesing <karsten.loesing@gmx.net>2009-12-18 12:55:05 +0100
commitf80672d74786c05a776fdbd8581d553c98d75e5a (patch)
treec9664ecf1c307a3dba4fc298f2d54fc19d0cc44b /src/or
parent235f1e1a967cb070c7246617461f58f0413394b3 (diff)
downloadtor-f80672d74786c05a776fdbd8581d553c98d75e5a.tar.gz
tor-f80672d74786c05a776fdbd8581d553c98d75e5a.zip
Remove duplicate words and a duplicate newline.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection.c2
-rw-r--r--src/or/connection_or.c2
-rw-r--r--src/or/control.c2
-rw-r--r--src/or/router.c2
-rw-r--r--src/or/routerlist.c2
-rw-r--r--src/or/routerparse.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index fdbe86741f..8de7ad9e5a 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;
}
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 60c5c7fcad..84023f5a7e 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -886,7 +886,7 @@ connection_or_nonopen_was_started_here(or_connection_t *conn)
* return -1 if he is lying, broken, or otherwise something is wrong.
*
* If we initiated this connection (<b>started_here</b> is true), make sure
- * the other side sent sent a correctly formed certificate. If I initiated the
+ * the other side sent a correctly formed certificate. If I initiated the
* connection, make sure it's the right guy.
*
* Otherwise (if we _didn't_ initiate this connection), it's okay for
diff --git a/src/or/control.c b/src/or/control.c
index d3ed8587bd..be1e921f31 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -279,7 +279,7 @@ connection_write_str_to_buf(const char *s, control_connection_t *conn)
/** Given a <b>len</b>-character string in <b>data</b>, made of lines
* terminated by CRLF, allocate a new string in *<b>out</b>, and copy the
* contents of <b>data</b> into *<b>out</b>, adding a period before any period
- * that that appears at the start of a line, and adding a period-CRLF line at
+ * that appears at the start of a line, and adding a period-CRLF line at
* the end. Replace all LF characters sequences with CRLF. Return the number
* of bytes in *<b>out</b>.
*/
diff --git a/src/or/router.c b/src/or/router.c
index 7362e60f66..e14f237728 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1660,7 +1660,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
return -1;
}
- /* PEM-encode the identity key key */
+ /* PEM-encode the identity key */
if (crypto_pk_write_public_key_to_string(router->identity_pkey,
&identity_pkey,&identity_pkeylen)<0) {
log_warn(LD_BUG,"write identity_pkey to string failed!");
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7275e1d5ce..133e1933ee 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3937,7 +3937,7 @@ client_would_use_router(routerstatus_t *rs, time_t now, or_options_t *options)
* this number per server. */
#define MIN_DL_PER_REQUEST 4
/** To prevent a single screwy cache from confusing us by selective reply,
- * try to split our requests into at least this this many requests. */
+ * try to split our requests into at least this many requests. */
#define MIN_REQUESTS 3
/** If we want fewer than this many descriptors, wait until we
* want more, or until MAX_CLIENT_INTERVAL_WITHOUT_REQUEST has
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index bc59a62b53..13dc10c0ea 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2928,7 +2928,7 @@ networkstatus_parse_detached_signatures(const char *s, const char *eos)
}
if (base16_decode(digests->d[alg], DIGEST256_LEN,
hexdigest, strlen(hexdigest)) < 0) {
- log_warn(LD_DIR, "Bad encoding on on consensus-digest in detached "
+ log_warn(LD_DIR, "Bad encoding on consensus-digest in detached "
"networkstatus signatures");
goto err;
}