finish poking and prodding. i'm all happy now.

svn:r8633

src/or/circuitbuild.c

@@ -218,7 +218,7 @@ circuit_log_path(int severity, unsigned int domain, origin_circuit_t *circ)
  * extended; the _first_ hop that isn't open (if any) is marked as
  * unable to extend.
  */
-/* XXXX Someday we should learn from or circuits too. */
+/* XXXX Someday we should learn from OR circuits too. */
 void
 circuit_rep_hist_note_result(origin_circuit_t *circ)
 {

src/or/connection_edge.c

@@ -2144,7 +2144,7 @@ connection_exit_connect(edge_connection_t *edge_conn)
  * bridge connection with a socketpair, create a new directory conn, and join
  * them together.  Return 0 on success (or if there was an error we could send
  * back an end cell for).  Return -1 if the circuit needs to be torn down.
- * Either connects exit_conn, or frees it, or marks it, as appropriate.
+ * Either connects exit_conn, frees it, or marks it, as appropriate.
  */
 static int
 connection_exit_connect_dir(edge_connection_t *exit_conn)

src/or/control.c

@@ -63,7 +63,7 @@ const char control_c_id[] =
 #define ERR_NO_ROUTER               0x000C
 
 /* Recognized asynchronous event types.  It's okay to expand this list
- * because it use used both as a list of v0 event types, and as indices
+ * because it is used both as a list of v0 event types, and as indices
  * into the bitfield to determine which controllers want which events.
  */
 #define _EVENT_MIN             0x0001
@@ -1058,8 +1058,8 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
       if (base16_decode(password, i/2+1, body, i)<0) {
         connection_write_str_to_buf(
             "551 Invalid hexadecimal encoding.  Maybe you tried a plain text "
-            "password?  If so, the standard requires you put it in double "
-            "quotes.\r\n", conn);
+            "password?  If so, the standard requires that you put it in "
+            "double quotes.\r\n", conn);
         tor_free(password);
         return 0;
       }
@@ -1108,7 +1108,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
     else
       errstr = "Password did not match HashedControlPassword value from "
         "configuration. Maybe you tried a plain text password? "
-        "If so, the standard requires you put it in double quotes.";
+        "If so, the standard requires that you put it in double quotes.";
     goto err;
   } else {
     /* if Tor doesn't demand any stronger authentication, then

src/or/or.h

@@ -2558,7 +2558,6 @@ typedef enum {
   V1_AUTHORITY, V2_AUTHORITY, HIDSERV_AUTHORITY,
 } authority_type_t;
 routerstatus_t *router_pick_trusteddirserver(authority_type_t type,
-
                                              int requireother,
                                              int fascistfirewall,
                                              int retry_if_no_servers);