nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-11 05:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-09-14 12:56:30 -04:00
commit 6f47734ea8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug27335 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (hidden service v3):
- In case the hidden service directory can't be created or has wrong
permissions, do not BUG() on it which lead to a non fatal stacktrace.
Fixes bug 27335; bugfix on 0.3.2.1.

4
src/or/hs_service.c
View File

@ -1005,9 +1005,9 @@ load_service_keys(hs_service_t *service)
* files to that directory so make sure it exists and has the right * files to that directory so make sure it exists and has the right
* permissions. We do this here because at this stage we know that Tor is * permissions. We do this here because at this stage we know that Tor is
* actually running and the service we have has been validated. */ * actually running and the service we have has been validated. */
if (BUG(hs_check_service_private_dir(get_options()->User, if (hs_check_service_private_dir(get_options()->User,
config->directory_path, config->directory_path,
config->dir_group_readable, 1) < 0)) { config->dir_group_readable, 1) < 0) {
goto end; goto end;
} }