mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 22:47:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.2.8'

Browse source
This commit is contained in:
Nick Mathewson 2016-07-05 12:43:17 -04:00
commit 8cae4abbac
5 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/asciidoc-UTC Normal file
View file

@ -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.

7
changes/bug19556 Normal file
View file

@ -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.

4
changes/bug19557 Normal file
View file

@ -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.

2
doc/asciidoc-helper.sh
View file

@ -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;

2
src/or/main.c
View file

@ -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");
}