aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-12-30 18:06:41 +0100
committerSebastian Hahn <sebastian@torproject.org>2011-12-30 23:27:02 +0100
commitd861b4cc9dcf5eda95d6d49b1f6d83cad4530ba0 (patch)
tree2c3b3410b15705fc57c856aaff6f5c39f60c1cd2
parent84bf8e3808d5f10e5ffd0d9f9f31760c6d3875ab (diff)
downloadtor-d861b4cc9dcf5eda95d6d49b1f6d83cad4530ba0.tar
tor-d861b4cc9dcf5eda95d6d49b1f6d83cad4530ba0.tar.gz
Fix spelling in a controlsocket log msg
Fixes bug 4803.
-rw-r--r--changes/bug48034
-rw-r--r--src/or/connection.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug4803 b/changes/bug4803
new file mode 100644
index 000000000..cd25266c7
--- /dev/null
+++ b/changes/bug4803
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Correctly spell "connect" in a log message when creating a controlsocket
+ fails. Fixes bug 4803; bugfix on 0.2.2.26-beta/0.2.3.2-alpha.
+
diff --git a/src/or/connection.c b/src/or/connection.c
index d36a37aba..a3481ece3 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -880,7 +880,7 @@ check_location_for_unix_socket(or_options_t *options, const char *path)
log_warn(LD_GENERAL, "Before Tor can create a control socket in %s, the "
"directory %s needs to exist, and to be accessible only by the "
"user%s account that is running Tor. (On some Unix systems, "
- "anybody who can list a socket can conect to it, so Tor is "
+ "anybody who can list a socket can connect to it, so Tor is "
"being careful.)", escpath, escdir,
options->ControlSocketsGroupWritable ? " and group" : "");
tor_free(escpath);