aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-10-07 09:13:30 +0000
committerRoger Dingledine <arma@torproject.org>2006-10-07 09:13:30 +0000
commit9fb98b269c0b8a7ac3cd2cb3228d0810c3416ffa (patch)
tree5e16818b5118d3cef4ccb24ba035879a7562dc02 /src/or/control.c
parenta339449a41fb4d05f9c996df457ba03093d43502 (diff)
downloadtor-9fb98b269c0b8a7ac3cd2cb3228d0810c3416ffa.tar
tor-9fb98b269c0b8a7ac3cd2cb3228d0810c3416ffa.tar.gz
finish poking and prodding. i'm all happy now.
svn:r8633
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 288874673..dc9cb60b9 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -63,7 +63,7 @@ const char control_c_id[] =
#define ERR_NO_ROUTER 0x000C
/* Recognized asynchronous event types. It's okay to expand this list
- * because it use used both as a list of v0 event types, and as indices
+ * because it is used both as a list of v0 event types, and as indices
* into the bitfield to determine which controllers want which events.
*/
#define _EVENT_MIN 0x0001
@@ -1058,8 +1058,8 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
if (base16_decode(password, i/2+1, body, i)<0) {
connection_write_str_to_buf(
"551 Invalid hexadecimal encoding. Maybe you tried a plain text "
- "password? If so, the standard requires you put it in double "
- "quotes.\r\n", conn);
+ "password? If so, the standard requires that you put it in "
+ "double quotes.\r\n", conn);
tor_free(password);
return 0;
}
@@ -1108,7 +1108,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
else
errstr = "Password did not match HashedControlPassword value from "
"configuration. Maybe you tried a plain text password? "
- "If so, the standard requires you put it in double quotes.";
+ "If so, the standard requires that you put it in double quotes.";
goto err;
} else {
/* if Tor doesn't demand any stronger authentication, then