January 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 483a59ec2a8285edcf4688755a9a17ddbdab75be Merge: 9b19e33be 0e7f1b06e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:21 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1 .travis.yml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc Merge: f406b9df0 1cf11b694 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:17:33 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix.

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 7d1d868ea0ed2cacd845677a86b4ddb813962ee1 Merge: e212c752f 49de586ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 19 Jan '18

19 Jan '18

commit de09c5be029f7e54e7cf572eb83eaac0f87a4970 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 19 15:16:12 2018 +0000 Update translations for tails-persistence-setup_completed --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/is.po b/is/is.po index 2eb49a9fe..b18dc033b 100644 --- a/is/is.po +++ b/is/is.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-19 17:08+0000\n" +"PO-Revision-Date: 2018-01-19 14:48+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 19 Jan '18

19 Jan '18

commit 88a0ace1fa9b3362007d03dc96c61682009ee2ff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 19 15:16:06 2018 +0000 Update translations for tails-persistence-setup --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/is.po b/is/is.po index 2eb49a9fe..b18dc033b 100644 --- a/is/is.po +++ b/is/is.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-19 17:08+0000\n" +"PO-Revision-Date: 2018-01-19 14:48+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 19 Jan '18

19 Jan '18

commit 306296065bbc52adaa18eb363d20b858194e687f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 19 15:15:31 2018 +0000 Update translations for whisperback_completed --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/is.po b/is/is.po index a60c72362..e3c86f53b 100644 --- a/is/is.po +++ b/is/is.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 17:08+0000\n" +"PO-Revision-Date: 2018-01-19 14:48+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 19 Jan '18

19 Jan '18

commit 902f42bcaab8dd4356248fde81538eab43e394a2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 19 15:15:25 2018 +0000 Update translations for whisperback --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/is.po b/is/is.po index a60c72362..e3c86f53b 100644 --- a/is/is.po +++ b/is/is.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 17:08+0000\n" +"PO-Revision-Date: 2018-01-19 14:48+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Add a mostly disabled feature to debug restarting in-process
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 97d9ba2380e0c894a1b611bdb4f35d0fe98a837a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 10:57:00 2017 -0500 Add a mostly disabled feature to debug restarting in-process For 23847, we want Tor to be able to shut down and then restart in the same process. Here's a patch to make the Tor binary do that. To test it, you need to build with --enable-restart-debugging, and then you need to set the environment variable TOR_DEBUG_RESTART. With this option, Tor will then run for 5 seconds, then restart itself in-process without exiting. This only happens once. You can change the 5-second interval using TOR_DEBUG_RESTART_AFTER_SECONDS. Implements ticket 24583. --- changes/feature24583 | 9 +++++++++ configure.ac | 6 ++++++ src/or/main.c | 39 +++++++++++++++++++++++++++++++++++++++ src/or/tor_main.c | 16 +++++++++++++++- 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/changes/feature24583 b/changes/feature24583 new file mode 100644 index 000000000..19feaec5b --- /dev/null +++ b/changes/feature24583 @@ -0,0 +1,9 @@ + o Minor features (testing, debugging): + - For development purposes, Tor now has a mode in which it runs + for a few seconds, then stops, and starts again without exiting + the process. This mode is meant to help us debug various issues + with ticket 23847. To use this feature, compile with + --enable-restart-degbugging, and set the TOR_DEBUG_RESTART + environment variable. This is expected to crash a lot, and is + really meant for developers only. It will likely be removed in a future + release. Implements ticket 24583. diff --git a/configure.ac b/configure.ac index ee75d3a29..36a27b54b 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,8 @@ AC_ARG_ENABLE(rust, AS_HELP_STRING(--enable-rust, [enable rust integration])) AC_ARG_ENABLE(cargo-online-mode, AS_HELP_STRING(--enable-cargo-online-mode, [Allow cargo to make network requests to fetch crates. For builds with rust only.])) +AC_ARG_ENABLE(restart-debugging, + AS_HELP_STRING(--enable-restart-debugging, [Build Tor with support for debugging in-process restart. Developers only.])) if test "x$enable_coverage" != "xyes" -a "x$enable_asserts_in_tests" = "xno" ; then AC_MSG_ERROR([Can't disable assertions outside of coverage build]) @@ -107,6 +109,10 @@ AC_ARG_ENABLE(systemd, * ) AC_MSG_ERROR(bad value for --enable-systemd) ;; esac], [systemd=auto]) +if test "$enable_restart_debugging" = "yes"; then + AC_DEFINE(ENABLE_RESTART_DEBUGGING, 1, + [Defined if we're building with support for in-process restart debugging.]) +fi # systemd support diff --git a/src/or/main.c b/src/or/main.c index aae98dd8a..dc954bc15 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -682,6 +682,20 @@ shutdown_did_not_work_callback(evutil_socket_t fd, short event, void *arg) // LCOV_EXCL_STOP } +#ifdef ENABLE_RESTART_DEBUGGING +static struct event *tor_shutdown_event_loop_for_restart_event = NULL; +static void +tor_shutdown_event_loop_for_restart_cb( + evutil_socket_t fd, short event, void *arg) +{ + (void)fd; + (void)event; + (void)arg; + tor_event_free(tor_shutdown_event_loop_for_restart_event); + tor_shutdown_event_loop_and_exit(0); +} +#endif + /** * After finishing the current callback (if any), shut down the main loop, * clean up the process, and exit with <b>exitcode</b>. @@ -2675,6 +2689,31 @@ do_main_loop(void) main_loop_should_exit = 0; main_loop_exit_value = 0; +#ifdef ENABLE_RESTART_DEBUGGING + { + static int first_time = 1; + + if (first_time && getenv("TOR_DEBUG_RESTART")) { + first_time = 0; + const char *sec_str = getenv("TOR_DEBUG_RESTART_AFTER_SECONDS"); + long sec; + int sec_ok=0; + if (sec_str && + (sec = tor_parse_long(sec_str, 10, 0, INT_MAX, &sec_ok, NULL)) && + sec_ok) { + /* Okay, we parsed the seconds. */ + } else { + sec = 5; + } + struct timeval restart_after = { (time_t) sec, 0 }; + tor_shutdown_event_loop_for_restart_event = + tor_evtimer_new(tor_libevent_get_base(), + tor_shutdown_event_loop_for_restart_cb, NULL); + event_add(tor_shutdown_event_loop_for_restart_event, &restart_after); + } + } +#endif + return run_main_loop_until_done(); } diff --git a/src/or/tor_main.c b/src/or/tor_main.c index c203d8248..703669ac9 100644 --- a/src/or/tor_main.c +++ b/src/or/tor_main.c @@ -3,6 +3,11 @@ * Copyright (c) 2007-2017, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +#include "orconfig.h" +#ifdef ENABLE_RESTART_DEBUGGING +#include <stdlib.h> +#endif + /** * \file tor_main.c * \brief Stub module containing a main() function. @@ -19,9 +24,18 @@ int tor_main(int argc, char *argv[]); int main(int argc, char *argv[]) { - int r = tor_main(argc, argv); + int r; +#ifdef ENABLE_RESTART_DEBUGGING + int restart_count = getenv("TOR_DEBUG_RESTART") ? 1 : 0; + again: +#endif + r = tor_main(argc, argv); if (r < 0 || r > 255) return 1; +#ifdef ENABLE_RESTART_DEBUGGING + else if (r == 0 && restart_count--) + goto again; +#endif else return r; }

1 0

[tor/master] Merge branch 'restart_debug_squashed'
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 2c9e0a286cad3c0bbc1797f75a8c516df476db62 Merge: e7907f15f 97d9ba238 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 09:52:14 2018 -0500 Merge branch 'restart_debug_squashed' changes/feature24583 | 9 +++++++++ configure.ac | 6 ++++++ src/or/main.c | 39 +++++++++++++++++++++++++++++++++++++++ src/or/tor_main.c | 16 +++++++++++++++- 4 files changed, 69 insertions(+), 1 deletion(-)

1 0