Merge branch 'maint-0.2.8' into release-0.2.8

5 files changed, 18 insertions, 1 deletions

diff --git a/changes/asciidoc-UTC b/changes/asciidoc-UTC
new file mode 100644
index 0000000000..21fbfc1d67
--- /dev/null
+++ b/changes/asciidoc-UTC
@@ -0,0 +1,4 @@
+  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.
diff --git a/changes/bug19556 b/changes/bug19556
new file mode 100644
index 0000000000..f4ac894f46
--- /dev/null
+++ b/changes/bug19556
@@ -0,0 +1,7 @@
+  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.
diff --git a/changes/bug19557 b/changes/bug19557
new file mode 100644
index 0000000000..9036cdc8e8
--- /dev/null
+++ b/changes/bug19557
@@ -0,0 +1,4 @@
+  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.
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
index c06b57026b..a3ef53f884 100755
--- a/doc/asciidoc-helper.sh
+++ b/doc/asciidoc-helper.sh
@@ -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;
diff --git a/src/or/main.c b/src/or/main.c
index f585f0be62..6b5619c7d6 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3530,6 +3530,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");
@@ -3568,6 +3569,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");
   }