summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-08-07 09:01:04 +0000
committerRoger Dingledine <arma@torproject.org>2004-08-07 09:01:04 +0000
commit44ff309c2685f0adfa0229210cdd58d43b1ceafe (patch)
tree82e76ca7de46e1a173bc1334043ae4aa382ea627
parent40fd45c1b4eee7a9913a9d1d416fabf44b31b26d (diff)
downloadtor-44ff309c2685f0adfa0229210cdd58d43b1ceafe.tar.gz
tor-44ff309c2685f0adfa0229210cdd58d43b1ceafe.zip
touch-ups
svn:r2192
-rw-r--r--src/or/buffers.c4
-rw-r--r--src/or/rephist.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 01b73bfe56..7d5153ad5e 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -497,7 +497,7 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) {
req->port = ntohs(*(uint16_t*)(buf->mem+8));
buf_remove_from_front(buf, 10);
if(!have_warned_about_unsafe_socks) {
- log_fn(LOG_WARN,"Your application (socks5, on port %d) is giving Tor only an IP address. Applications that do DNS resolves themselves may leak information. Consider using Socks4A (e.g. via privoxy or socat) instead.", req->port);
+ log_fn(LOG_WARN,"Your application (using socks5 on port %d) is giving Tor only an IP address. Applications that do DNS resolves themselves may leak information. Consider using Socks4A (e.g. via privoxy or socat) instead.", req->port);
// have_warned_about_unsafe_socks = 1; // (for now, warn every time)
}
return 1;
@@ -566,7 +566,7 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) {
startaddr = next+1;
if(socks4_prot != socks4a && !have_warned_about_unsafe_socks) {
- log_fn(LOG_WARN,"Your application (socks4, on port %d) is giving Tor only an IP address. Applications that do DNS resolves themselves may leak information. Consider using Socks4A (e.g. via privoxy or socat) instead.", req->port);
+ log_fn(LOG_WARN,"Your application (using socks4 on port %d) is giving Tor only an IP address. Applications that do DNS resolves themselves may leak information. Consider using Socks4A (e.g. via privoxy or socat) instead.", req->port);
// have_warned_about_unsafe_socks = 1; // (for now, warn every time)
}
if(socks4_prot == socks4a) {
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 4de57ac863..5159aa51fa 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -506,7 +506,7 @@ char *rep_hist_get_bandwidth_lines(void)
for (r=0;r<2;++r) {
b = r?read_array:write_array;
format_iso_time(t, b->next_period-NUM_SECS_BW_SUM_INTERVAL);
- sprintf(cp, "opt %s-history %s (%d s)", r?"read":"write", t,
+ sprintf(cp, "opt %s %s (%d s)", r?"read-history ":"write-history", t,
NUM_SECS_BW_SUM_INTERVAL);
cp += strlen(cp);