[or-cvs] r12253: Clean up a couple of comments from r12244. (in tor/trunk: . doc/spec src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-10-28 14:29:29 -0400 (Sun, 28 Oct 2007)
New Revision: 12253

Modified:
   tor/trunk/
   tor/trunk/doc/spec/socks-extensions.txt
   tor/trunk/src/or/or.h
Log:
 r16234@catbus:  nickm | 2007-10-28 14:27:22 -0400
 Clean up a couple of comments from r12244.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16234] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/spec/socks-extensions.txt
===================================================================
--- tor/trunk/doc/spec/socks-extensions.txt	2007-10-28 16:23:59 UTC (rev 12252)
+++ tor/trunk/doc/spec/socks-extensions.txt	2007-10-28 18:29:29 UTC (rev 12253)
@@ -60,7 +60,8 @@
   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

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-10-28 16:23:59 UTC (rev 12252)
+++ tor/trunk/src/or/or.h	2007-10-28 18:29:29 UTC (rev 12253)
@@ -910,10 +910,11 @@
   /** 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