[or-cvs] r8568: misc touchups (in tor/trunk: doc doc/design-paper src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2006-10-01 17:42:44 -0400 (Sun, 01 Oct 2006)
New Revision: 8568

Modified:
   tor/trunk/doc/design-paper/blocking.tex
   tor/trunk/doc/tor-spec.txt
   tor/trunk/src/or/connection.c
   tor/trunk/src/or/directory.c
Log:
misc touchups


Modified: tor/trunk/doc/design-paper/blocking.tex
===================================================================
--- tor/trunk/doc/design-paper/blocking.tex	2006-10-01 21:32:46 UTC (rev 8567)
+++ tor/trunk/doc/design-paper/blocking.tex	2006-10-01 21:42:44 UTC (rev 8568)
@@ -350,3 +350,5 @@
 
 \end{document}
 
+% need a way for users to get tor itself. (discuss trust chain.)
+

Modified: tor/trunk/doc/tor-spec.txt
===================================================================
--- tor/trunk/doc/tor-spec.txt	2006-10-01 21:32:46 UTC (rev 8567)
+++ tor/trunk/doc/tor-spec.txt	2006-10-01 21:42:44 UTC (rev 8568)
@@ -757,7 +757,7 @@
       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

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2006-10-01 21:32:46 UTC (rev 8567)
+++ tor/trunk/src/or/connection.c	2006-10-01 21:42:44 UTC (rev 8568)
@@ -2223,6 +2223,11 @@
    */
 #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) {

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2006-10-01 21:32:46 UTC (rev 8567)
+++ tor/trunk/src/or/directory.c	2006-10-01 21:42:44 UTC (rev 8568)
@@ -236,7 +236,7 @@
 }
 
 /** 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}.
  *