February 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334 Merge: 0a43134 5446cb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:29:27 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.

1 0

[tor/release-0.2.8] Revert "Add hidserv-stats filname to our sandbox filter"
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6. This reverts commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7. --- changes/bug17354 | 4 ---- src/or/main.c | 1 - 2 files changed, 5 deletions(-) diff --git a/changes/bug17354 b/changes/bug17354 deleted file mode 100644 index 53da007..0000000 --- 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 df0cd1b..e539222 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");

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit f9be4b96362699a77469cea954270c21c39bc171 Merge: 535e034 5446cb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:30:31 2017 -0500 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bug17354 | 4 ---- src/or/main.c | 1 - 2 files changed, 5 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 6cfbaed3a59b4568a1d922df15f041a18789058e Merge: 632d006 86d5a6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:30:33 2017 -0500 Merge branch 'maint-0.2.7' into release-0.2.7

1 0

[tor/release-0.2.9] Revert "Add hidserv-stats filname to our sandbox filter"
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6. This reverts commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7. --- changes/bug17354 | 4 ---- src/or/main.c | 1 - 2 files changed, 5 deletions(-) diff --git a/changes/bug17354 b/changes/bug17354 deleted file mode 100644 index 53da007..0000000 --- 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 df0cd1b..e539222 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");

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 65cda78ec6037da8059526d1c23449013f921ed2 Merge: a271ad2 a9f936d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:30:19 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 5f8440981aa0cabd5dfda8f0515c4a42e185f5ab Merge: 9583b34 a9f936d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:30:36 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit a9f936d0d757c5628a8da0b88af4710b2f6d22fd Merge: b60fb3a 86d5a6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:30:10 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334 Merge: 0a43134 5446cb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:29:27 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 4f1fcaa27be7df293a10f820728a81adc702a8c3 Merge: 1ed6cb0 65cda78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:30:38 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9

1 0