summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-05 12:40:25 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-05 12:40:25 -0400
commit8d25ab6347910784ee100b6b4a784c7a6779277b (patch)
tree02bce83cbfa06d07e95bada17ea7da83a561f71e
parent74cbbda86e01a40e5cbf7889d5a5bc3445f68510 (diff)
parent55d380f3dfbc2e0c1c4aa748e38d73593454069b (diff)
downloadtor-8d25ab6347910784ee100b6b4a784c7a6779277b.tar.gz
tor-8d25ab6347910784ee100b6b4a784c7a6779277b.zip
Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8
-rw-r--r--changes/bug195574
-rw-r--r--src/or/main.c1
2 files changed, 5 insertions, 0 deletions
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/src/or/main.c b/src/or/main.c
index 0562f84242..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");