Commit 8cae4abb authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.8'

parents f54ffa46 8d25ab63

changes/asciidoc-UTC

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (build):

    - When building manual pages, set the timezone to "UTC", so that the

      output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha.

      Patch from intrigeri.

changes/bug19556

0 → 100644
+7 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (sandboxing):

    - When sandboxing is enabled, we could not write any stats to

      disk.  check_or_create_data_subdir("stats"), which prepares the

      private stats directory, calls check_private_dir(), which also

      opens and not just stats() the directory.  Therefore, we need to

      also allow open() for the stats dir in our sandboxing setup.

      Fixes bug 19556.

changes/bug19557

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Major bugfixes (sandboxing):

    - Our sandboxing code would not allow us to write to stats/hidserv-stats,

      causing tor to abort while trying to write stats.  This was previously

      masked by bug 19556.  Fixes bug 19557.

doc/asciidoc-helper.sh

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ if [ "$1" = "html" ]; then 
    base=${output%%.html.in}



    if [ "$2" != none ]; then

      "$2" -d manpage -o $output $input;

      TZ=UTC "$2" -d manpage -o $output $input;

    else

      echo "==================================";

      echo;

src/or/main.c

+2 −0
Original line number Diff line number Diff line
@@ -3542,6 +3542,7 @@ sandbox_init_filter(void) 
    OPEN_DATADIR2_SUFFIX("stats", "exit-stats", ".tmp");

    OPEN_DATADIR2_SUFFIX("stats", "buffer-stats", ".tmp");

    OPEN_DATADIR2_SUFFIX("stats", "conn-stats", ".tmp");

    OPEN_DATADIR2_SUFFIX("stats", "hidserv-stats", ".tmp");



    OPEN_DATADIR("approved-routers");

    OPEN_DATADIR_SUFFIX("fingerprint", ".tmp");
@@ -3580,6 +3581,7 @@ sandbox_init_filter(void) 
             get_datadir_fname2("keys", "secret_onion_key_ntor.old"));



    STAT_DATADIR("keys");

    OPEN_DATADIR("stats");

    STAT_DATADIR("stats");

    STAT_DATADIR2("stats", "dirreq-stats");

  }