nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2012-01-03 13:22:34 -05:00
commit 47b7a27929
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug4803 Normal file
View File

@ -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.

2
src/or/connection.c
View File

@ -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);