aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/exitlist2
-rw-r--r--doc/spec/proposals/111-local-traffic-priority.txt2
-rw-r--r--src/or/dirserv.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/exitlist b/contrib/exitlist
index 86295c7d8..39c32f9ff 100755
--- a/contrib/exitlist
+++ b/contrib/exitlist
@@ -218,7 +218,7 @@ def run():
opts, pargs = getopt.getopt(sys.argv[1:], "vx")
except getopt.GetoptError, e:
print """
-usage: %s [-v] [-x] [host:port [host:port [...]]]
+usage: cat ~/.tor/cached-routers* | %s [-v] [-x] [host:port [host:port [...]]]
-v verbose output
-x invert results
""" % sys.argv[0]
diff --git a/doc/spec/proposals/111-local-traffic-priority.txt b/doc/spec/proposals/111-local-traffic-priority.txt
index fa060b510..62ee603a2 100644
--- a/doc/spec/proposals/111-local-traffic-priority.txt
+++ b/doc/spec/proposals/111-local-traffic-priority.txt
@@ -21,7 +21,7 @@ Motivation:
they're limited to the same download capacity as upload capacity. And
they have to enable rate limiting, or their upstream pipe gets filled
up, starts dropping packets, and now their net connection doesn't work
- even for non-Tor stuff. So they end up turning off the relaying part.
+ even for non-Tor stuff. So they end up turning off the relaying part
so they can use Tor (and other applications) again.
So far this hasn't mattered that much: most of our fast relays are
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 483c6e4c3..6f11cfd7e 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2093,7 +2093,7 @@ connection_dirserv_stop_blocking_all_on_or_conn(or_connection_t *or_conn)
{
dir_connection_t *dir_conn, *next;
- dir_conn=or_conn->blocked_dir_connections;
+ dir_conn = or_conn->blocked_dir_connections;
while (dir_conn) {
next = dir_conn->next_blocked_on_same_or_conn;