aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-10-28 18:29:29 +0000
committerNick Mathewson <nickm@torproject.org>2007-10-28 18:29:29 +0000
commit665aa7659cef111ce47404ea9a67645535d8c84d (patch)
tree0f65b26dc099a1257bfeb28c43a47aa43e765dff
parentabe8afbdc9f5ada027c68953f28bfdc3a1bc6e03 (diff)
downloadtor-665aa7659cef111ce47404ea9a67645535d8c84d.tar.gz
tor-665aa7659cef111ce47404ea9a67645535d8c84d.zip
r16234@catbus: nickm | 2007-10-28 14:27:22 -0400
Clean up a couple of comments from r12244. svn:r12253
-rw-r--r--doc/spec/socks-extensions.txt3
-rw-r--r--src/or/or.h7
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/spec/socks-extensions.txt b/doc/spec/socks-extensions.txt
index 49c9660b1e..8d58987f35 100644
--- a/doc/spec/socks-extensions.txt
+++ b/doc/spec/socks-extensions.txt
@@ -60,7 +60,8 @@ Tor's extensions to the SOCKS protocol
directory port of the Tor server specified by address:port (the port
specified should be the ORPort of the server). It uses a one-hop tunnel
and a "BEGIN_DIR" relay cell to accomplish this secure connection.
- Th F2 command value was removed in Tor 0.2.0.10-alpha in favor of a
+
+ The F2 command value was removed in Tor 0.2.0.10-alpha in favor of a
new use_begindir flag in edge_connection_t.
4. HTTP-resistance
diff --git a/src/or/or.h b/src/or/or.h
index e151a678ca..fbc7e9faed 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -910,10 +910,11 @@ typedef struct edge_connection_t {
/** True iff this connection is for a dns request only. */
unsigned int is_dns_request : 1;
- /** True iff this stream wants a one-hop circuit (e.g. for begin_dir). */
+ /** True iff this stream must attach to a one-hop circuit (e.g. for
+ * begin_dir). */
int want_onehop:1;
- /** True iff this stream should use a begin_dir connection (either via
- * onehop or via a whole circuit). */
+ /** True iff this stream should use a BEGIN_DIR relay command to establish
+ * itself rather than BEGIN (either via onehop or via a whole circuit). */
int use_begindir:1;
/** If this is a DNSPort connection, this field holds the pending DNS