other minor fixes lurking in my sandbox

svn:r9854

diff --git a/contrib/exitlist b/contrib/exitlist
index 86295c7d87aa3fdb12180edf6d5ac3885362885b..39c32f9ff46a68ba9538b8bec0b915f1691061cf 100755 (executable)
--- 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 fa060b510f3ca0d0db52aadf5bc96571bacdb651..62ee603a258ea8d206e82ada2f9d0578202aea5e 100644 (file)
--- 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 483c6e4c3a2e0c46823abc762898ad1539f4850b..6f11cfd7e8b6dac0354fed2ec9c381adaa6adea6 100644 (file)
--- 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;