diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-15 17:41:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-15 17:41:13 -0400 |
| commit | 1f35fd0017240a82ae48475a989819aa81a297dc (patch) | |
| tree | 4d7fb326b4ca734228671b10391b8c7bbb1b643a /src/or/control.c | |
| parent | be231b0db196513036ee624dc5b9b87c4f898625 (diff) | |
| parent | 967b4e7c54b53391e1a0b67e0a5bf70bc2e6a896 (diff) | |
| download | tor-1f35fd0017240a82ae48475a989819aa81a297dc.tar.gz tor-1f35fd0017240a82ae48475a989819aa81a297dc.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index 9285fc564a..ec63506194 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4666,6 +4666,7 @@ init_control_cookie_authentication(int enabled) fname = get_controller_cookie_file_name(); retval = init_cookie_authentication(fname, "", /* no header */ AUTHENTICATION_COOKIE_LEN, + get_options()->CookieAuthFileGroupReadable, &authentication_cookie, &authentication_cookie_is_set); tor_free(fname); |