Commit a546e076 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.2' into maint-0.3.3

parents 281854ba 0971b3ce

changes/bug27335

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/or/hs_service.c

+3 −3
Original line number Diff line number Diff line
@@ -983,9 +983,9 @@ load_service_keys(hs_service_t *service) 
   * 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

   * 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->dir_group_readable, 1) < 0)) {

                                   config->dir_group_readable, 1) < 0) {

    goto end;

  }