diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-15 13:56:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-15 13:56:41 -0400 |
| commit | 7e7683b254f8124e0115c9112488e47bff2b1d22 (patch) | |
| tree | 3a7aef334c964f89cf3acdb165298455a3ce5561 | |
| parent | a5ed8b1667156384483c12eb4f98d511c6dd2bd3 (diff) | |
| parent | 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7 (diff) | |
| download | tor-7e7683b254f8124e0115c9112488e47bff2b1d22.tar.gz tor-7e7683b254f8124e0115c9112488e47bff2b1d22.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
| -rw-r--r-- | changes/bug17354 | 4 | ||||
| -rw-r--r-- | src/or/main.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug17354 b/changes/bug17354 new file mode 100644 index 0000000000..53da007fbb --- /dev/null +++ b/changes/bug17354 @@ -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. diff --git a/src/or/main.c b/src/or/main.c index 693d13cd13..9b3dbb5586 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -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"); |