diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-10-01 21:42:44 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-10-01 21:42:44 +0000 |
| commit | 3fcf736c83a42ceeb71c0581cc29255e5b0a6542 (patch) | |
| tree | 77f860eae45b829b5bcace8f4ca5192f8d66b840 | |
| parent | 4200eb16f9c23be618a05edf92b7904498389373 (diff) | |
| download | tor-3fcf736c83a42ceeb71c0581cc29255e5b0a6542.tar.gz tor-3fcf736c83a42ceeb71c0581cc29255e5b0a6542.zip | |
misc touchups
svn:r8568
| -rw-r--r-- | doc/design-paper/blocking.tex | 2 | ||||
| -rw-r--r-- | doc/tor-spec.txt | 2 | ||||
| -rw-r--r-- | src/or/connection.c | 5 | ||||
| -rw-r--r-- | src/or/directory.c | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/doc/design-paper/blocking.tex b/doc/design-paper/blocking.tex index ebc677ab82..fc6182e155 100644 --- a/doc/design-paper/blocking.tex +++ b/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.) + diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt index bca3ebe5c5..7ee285b519 100644 --- a/doc/tor-spec.txt +++ b/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 diff --git a/src/or/connection.c b/src/or/connection.c index 0b87d6bc66..9c64e324f4 100644 --- a/src/or/connection.c +++ b/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) { diff --git a/src/or/directory.c b/src/or/directory.c index 3ac11b6c58..0de573286f 100644 --- a/src/or/directory.c +++ b/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}. * |