diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:30:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:30:31 -0500 |
| commit | f9be4b96362699a77469cea954270c21c39bc171 (patch) | |
| tree | 0f6e846b6808934ca7f4d0e96b3c6bf1236ab3a9 | |
| parent | 535e03400419340c3bed2af5fa810308727293c5 (diff) | |
| parent | 5446cb8d3d536e9bc737de6d9286bd4b4b185661 (diff) | |
| download | tor-f9be4b96362699a77469cea954270c21c39bc171.tar.gz tor-f9be4b96362699a77469cea954270c21c39bc171.zip | |
Merge branch 'maint-0.2.6' into release-0.2.6
| -rw-r--r-- | changes/bug17354 | 4 | ||||
| -rw-r--r-- | src/or/main.c | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/changes/bug17354 b/changes/bug17354 deleted file mode 100644 index 53da007fbb..0000000000 --- a/changes/bug17354 +++ /dev/null @@ -1,4 +0,0 @@ - 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 df0cd1bee3..e53922218d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3018,7 +3018,6 @@ 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"); |