April 2015 - tor-commits - lists.torproject.org

[torspec/master] Merge remote-tracking branch 'karsten/task-15276'
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit e80b15b4c03d7cee964214744efbbac29ae9b6cf Merge: 59e4c5e 26929b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 1 12:52:57 2015 -0400 Merge remote-tracking branch 'karsten/task-15276' dir-spec.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/master] Remove extra newline at the end of HS descriptor
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit c9534f7902fa222f2076136f460b13689d75ab41 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Mar 16 09:04:51 2015 -0400 Remove extra newline at the end of HS descriptor The rend-spec.txt document doesn't specify this extra newline. Furthermore, this is the only descryptor type that contains one. Client and HSDir without this patch still work perfectly since the HS descriptor parsing doesn't expect a newline at the end. Fixes #15296 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendcommon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 866f4fb..174f1c4 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -646,7 +646,6 @@ rend_encode_v2_descriptors(smartlist_t *descs_out, rend_encoded_v2_service_descriptor_free(enc); goto err; } - desc_str[written++] = '\n'; desc_str[written++] = 0; /* Check if we can parse our own descriptor. */ if (!rend_desc_v2_is_parsable(enc)) {

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug15296_027_01'
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit 13209eb6f34165eb72ecd4425770cba6af4f5391 Merge: 0ddd8f0 c9534f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 1 12:50:36 2015 -0400 Merge remote-tracking branch 'dgoulet/bug15296_027_01' src/or/rendcommon.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/master] add changes file for 15296.
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit fec3091129ccde0b61d2c5468117a869436e0274 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 1 12:52:00 2015 -0400 add changes file for 15296. --- changes/bug15296 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug15296 b/changes/bug15296 new file mode 100644 index 0000000..5230a41 --- /dev/null +++ b/changes/bug15296 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Remove an extraneous newline character from the end of hidden + service descriptors. Fixes bug 15296; bugfix on 0.2.0.10-alpha.

1 0

[tor/master] Use prctl() to have the kernel SIGTERM background processes on exit.
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit fa81508eb2d9a2a2ea69c2c585735aef7aaff97c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Mar 26 14:56:14 2015 +0000 Use prctl() to have the kernel SIGTERM background processes on exit. This uses a Linux-ism to attempt to always clean up background processes if possible. Note that it is not a catch-all, in that executables with suid/sgid or elevated capabilities will have the prctl() attribute stripped as part of the execve(). Resolves ticket 15471. --- changes/feature15471 | 5 +++++ src/common/util.c | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/feature15471 b/changes/feature15471 new file mode 100644 index 0000000..594adf0 --- /dev/null +++ b/changes/feature15471 @@ -0,0 +1,5 @@ + o Minor features (pluggable transports): + - When launching managed pluggable transports on linux systems, + attempt to have the kernel deliver a SIGTERM on tor exit if + the pluggable transport process is still running. Resolves + ticket 15471. diff --git a/src/common/util.c b/src/common/util.c index 2c3a1a1..246a0d3 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -95,6 +95,9 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif +#if defined(HAVE_SYS_PRCTL_H) && defined(__linux__) +#include <sys/prctl.h> +#endif #ifdef __clang_analyzer__ #undef MALLOC_ZERO_WORKS @@ -4180,6 +4183,15 @@ tor_spawn_background(const char *const filename, const char **argv, if (0 == pid) { /* In child */ +#if defined(HAVE_SYS_PRCTL_H) && defined(__linux__) + /* Attempt to have the kernel issue a SIGTERM if the parent + * goes away. Certain attributes of the binary being execve()ed + * will clear this during the execve() call, but it's better + * than nothing. + */ + prctl(PR_SET_PDEATHSIG, SIGTERM); +#endif + child_state = CHILD_STATE_DUPOUT; /* Link child stdout to the write end of the pipe */ @@ -4225,8 +4237,10 @@ tor_spawn_background(const char *const filename, const char **argv, does not modify the arguments */ if (env) execve(filename, (char *const *) argv, env->unixoid_environment_block); - else - execvp(filename, (char *const *) argv); + else { + static char *new_env[] = { NULL }; + execve(filename, (char *const *) argv, new_env); + } /* If we got here, the exec or open(/dev/null) failed */

1 0

[tor/master] Merge remote-tracking branch 'yawning/feature15471'
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit 0ddd8f06a9e0c1ff3f5b5ede7e2a274d303645ea Merge: 162fd52 fa81508 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 1 12:47:16 2015 -0400 Merge remote-tracking branch 'yawning/feature15471' changes/feature15471 | 5 +++++ src/common/util.c | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix ReleaseNotes so that entries about docs are in Documentation section.
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit 162fd52b405918a78bf25d7e043edd16a53a2e0f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Mar 31 21:19:26 2015 +0300 Fix ReleaseNotes so that entries about docs are in Documentation section. --- ReleaseNotes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index 6c91262..18bb8f2 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -858,6 +858,8 @@ Changes in version 0.2.6.6 - 2015-03-24 - Refactor our generic strmap and digestmap types into a single implementation, so that we can add a new digest256map type trivially. + + o Documentation: - Add a doc/TUNING document with tips for handling large numbers of TCP connections when running busy Tor relay. Update the warning message to point to this file when running out of sockets

1 0

[tor/release-0.2.6] Fix ReleaseNotes so that entries about docs are in Documentation section.
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit db769b640752488f1aa2c398cdfa43a5ac792670 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Mar 31 21:19:26 2015 +0300 Fix ReleaseNotes so that entries about docs are in Documentation section. --- ReleaseNotes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index f84aac2..57abebf 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -858,6 +858,8 @@ Changes in version 0.2.6.6 - 2015-03-24 - Refactor our generic strmap and digestmap types into a single implementation, so that we can add a new digest256map type trivially. + + o Documentation: - Add a doc/TUNING document with tips for handling large numbers of TCP connections when running busy Tor relay. Update the warning message to point to this file when running out of sockets

1 0

[metrics-db/master] Remove link to Kostas' Searchable Tor Metrics Archive.
by karsten＠torproject.org 01 Apr '15

01 Apr '15

commit f49701ccdf44186d4a2665c43d3de056d1a1d017 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 1 13:40:13 2015 +0200 Remove link to Kostas' Searchable Tor Metrics Archive. Kostas informs me that the service has become unavailable, so let's take out the link for now. --- web/index.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/web/index.html b/web/index.html index c1ca018..8f750fb 100644 --- a/web/index.html +++ b/web/index.html @@ -149,12 +149,6 @@ how specific relays or bridges contribute to the Tor network. They all use <a href="https://onionoo.torproject.org/">Onionoo</a> as their data back-end service which in turn uses the Tor network data provided here.</li> -<li>The <a href="http://ts.mkj.lt/">Searchable Tor Metrics Archive</a> -allows users to search and explore relay metrics data (consensuses and -descriptors), present and past. -It covers the years 2008–now and provides an -<a href="https://onionoo.torproject.org/protocol.html">Onionoo-like -API</a>.</li> <li>The <a href="https://shadow.github.io/">Shadow Simulator</a> uses archived Tor directory data to generate network topologies that match the real Tor network as close as possible.</li>

1 0

[tor-messenger-build/master] Update Tor Browser version to 4.0.6
by sukhbir＠torproject.org 01 Apr '15

01 Apr '15

commit 7653324009ee4e6fcaa11768f1b2fd2bd7bae9c6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Apr 1 05:34:41 2015 -0400 Update Tor Browser version to 4.0.6 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index f995b72..04b9761 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml -version: 4.0.4 +version: 4.0.6 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0