misc touchups

svn:r8568

doc/design-paper/blocking.tex

@@ -350,3 +350,5 @@ Hidden services as bridges.
 
 \end{document}
 
+% need a way for users to get tor itself. (discuss trust chain.)
+

doc/tor-spec.txt

@@ -757,7 +757,7 @@ TODO:
       12 -- REASON_CONNRESET      (Connection was unexpectedly reset)
       13 -- REASON_TORPROTOCOL    (Sent when closing connection because of
                                    Tor protocol violations.)
-      14 -- REASON_NOTDIRECTORY   (Client send RELAY_BEGIN_DIR to a
+      14 -- REASON_NOTDIRECTORY   (Client sent RELAY_BEGIN_DIR to a
                                    non-directory server.)
 
    (With REASON_EXITPOLICY, the 4-byte IPv4 address or 16-byte IPv6 address

src/or/connection.c

@@ -2223,6 +2223,11 @@ assert_connection_ok(connection_t *conn, time_t now)
    */
 #endif
 
+  if (conn->chosen_exit_optional) {
+    tor_assert(conn->type == CONN_TYPE_AP);
+    tor_assert((TO_EDGE_CONN(conn))->chosen_exit_name);
+  }
+
   if (conn->type == CONN_TYPE_OR) {
     or_connection_t *or_conn = TO_OR_CONN(conn);
     if (conn->state == OR_CONN_STATE_OPEN) {

src/or/directory.c

@@ -236,7 +236,7 @@ directory_initiate_command_router(routerinfo_t *router,
 }
 
 /** Launch a new connection to the directory server <b>status</b> to upload or
- * download a service or rendezvous descriptor. <b>purpose</b> determines what
+ * download a server or rendezvous descriptor. <b>purpose</b> determines what
  * kind of directory connection we're launching, and must be one of
  * DIR_PURPOSE_{FETCH|UPLOAD}_{DIR|RENDDESC}.
  *