Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7

This commit is contained in:
Nick Mathewson 2015-10-15 13:56:41 -04:00
commit 7e7683b254
2 changed files with 5 additions and 0 deletions

4
changes/bug17354 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (sandbox):
- Add the "hidserv-stats" filename to our sandbox filter for the
HiddenServiceStatistics option to work properly. Fixes bug 17354;
bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet.

View File

@ -3200,6 +3200,7 @@ sandbox_init_filter(void)
RENAME_SUFFIX2("stats", "exit-stats", ".tmp");
RENAME_SUFFIX2("stats", "buffer-stats", ".tmp");
RENAME_SUFFIX2("stats", "conn-stats", ".tmp");
RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp");
RENAME_SUFFIX("hashed-fingerprint", ".tmp");
RENAME_SUFFIX("router-stability", ".tmp");