summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-12-24 06:32:24 +0000
committerNick Mathewson <nickm@torproject.org>2006-12-24 06:32:24 +0000
commitbae366eff015dffc2b86eeb89cb7d23c81918eaf (patch)
tree862162f37bb4fa40214396664621e49698b3d4fc /src/or/or.h
parentc12a1f1e3ad5d8baca70e5b17a6f19b0bbdcb022 (diff)
downloadtor-bae366eff015dffc2b86eeb89cb7d23c81918eaf.tar.gz
tor-bae366eff015dffc2b86eeb89cb7d23c81918eaf.zip
r11702@Kushana: nickm | 2006-12-24 01:31:59 -0500
Patch from Edmanm, slightly modified. Original change list: - Support running the Tor service with a torrc not in the same directory as tor.exe (Bug #356) and default to using the torrc located in the %appdata%\Tor\ of the user who installed the service - Removed the supposedly misleading error message mentioned in Bug #294 - Fixed some CloseHandle()s that should've been CloseServiceHandle()s - Fixed some nt_service_foo() return values to be consistent - Resolved some nt_service_foo() DOCDOCs - Fixed one trivial typo that I happened to randomly notice Changes: - Make more comments into "imperative" house style. - Remove special handling for "-f"; only use --options. - Quote all options. - Clean up whitespace svn:r9185
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 15dee82437..82abdb3032 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1221,7 +1221,7 @@ typedef uint16_t circid_t;
* OR connections multiplex many circuits at once, and stay standing even
* when there are no circuits running over them.
*
- * A circuit_t structure cann fill one of two roles. First, a or_circuit_t
+ * A circuit_t structure can fill one of two roles. First, a or_circuit_t
* links two connections together: either an edge connection and an OR
* connection, or two OR connections. (When joined to an OR connection, a
* circuit_t affects only cells sent to a particular circID on that