diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-03 13:22:34 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-03 13:22:34 -0500 |
| commit | 47b7a279298c81137430527ed0a72c6a6d3fcd61 (patch) | |
| tree | 7c425c1305d0b2a9708937a4e66493605ec033d7 /src/or/connection.c | |
| parent | 5d9be4954065296b622cb1dd560105ef284d519e (diff) | |
| parent | d861b4cc9dcf5eda95d6d49b1f6d83cad4530ba0 (diff) | |
| download | tor-47b7a279298c81137430527ed0a72c6a6d3fcd61.tar.gz tor-47b7a279298c81137430527ed0a72c6a6d3fcd61.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 627580b096..3e445166bd 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -817,7 +817,7 @@ check_location_for_unix_socket(const 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); |