March 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/723'
by asn＠torproject.org 04 Mar '19

04 Mar '19

commit c5da1f1cd52dfbf6dc68fba70df42ec4976a589c Merge: fe2552ad6 065e7da8e Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 4 18:55:28 2019 +0200 Merge branch 'tor-github/pr/723' src/lib/malloc/map_anon.c | 34 ++++++++++++++++++++++++++++++++-- src/lib/malloc/map_anon.h | 4 ++++ src/test/test_util.c | 34 +++++++++++++++++++++++++--------- 3 files changed, 61 insertions(+), 11 deletions(-)

1 0

[tor/master] Re-enable and fix unit test for nofork mappings
by asn＠torproject.org 04 Mar '19

04 Mar '19

commit 065e7da8e6fdbd9331de8c13344275a8e0fbf32d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 25 08:55:25 2019 -0500 Re-enable and fix unit test for nofork mappings This test was previously written to use the contents of the system headers to decide whether INHERIT_NONE or INHERIT_ZERO was going to work. But that won't work across different environments, such as (for example) when the kernel doesn't match the headers. Instead, we add a testing-only feature to the code to track which of these options actually worked, and verify that it behaved as we expected. Closes ticket 29541; bugfix not on any released version of Tor. --- src/lib/malloc/map_anon.c | 34 ++++++++++++++++++++++++++++++++-- src/lib/malloc/map_anon.h | 4 ++++ src/test/test_util.c | 34 +++++++++++++++++++++++++--------- 3 files changed, 61 insertions(+), 11 deletions(-) diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 2fc6e89ea..5dac5256a 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -107,6 +107,29 @@ nodump_mem(void *mem, size_t sz) #endif } +#ifdef TOR_UNIT_TESTS +static unsigned last_anon_map_noinherit = ~0; +/* Testing helper: return the outcome of the last call to noinherit_mem(): + * 0 if it did no good; 1 if it caused the memory not to be inherited, and + * 2 if it caused the memory to be cleared on fork */ +unsigned +get_last_anon_map_noinherit(void) +{ + return last_anon_map_noinherit; +} +static void +set_last_anon_map_noinherit(unsigned f) +{ + last_anon_map_noinherit = f; +} +#else +static void +set_last_anon_map_noinherit(unsigned f) +{ + (void)f; +} +#endif + /** * Helper: try to prevent the <b>sz</b> bytes at <b>mem</b> from being * accessible in child processes -- ideally by having them set to 0 after a @@ -117,13 +140,20 @@ nodump_mem(void *mem, size_t sz) static int noinherit_mem(void *mem, size_t sz) { + set_last_anon_map_noinherit(0); #ifdef FLAG_ZERO int r = MINHERIT(mem, sz, FLAG_ZERO); - if (r == 0) + if (r == 0) { + set_last_anon_map_noinherit(2); return 0; + } #endif #ifdef FLAG_NOINHERIT - return MINHERIT(mem, sz, FLAG_NOINHERIT); + int r2 = MINHERIT(mem, sz, FLAG_NOINHERIT); + if (r2 == 0) { + set_last_anon_map_noinherit(1); + } + return r2; #else (void)mem; (void)sz; diff --git a/src/lib/malloc/map_anon.h b/src/lib/malloc/map_anon.h index cc5797e4e..395145bd7 100644 --- a/src/lib/malloc/map_anon.h +++ b/src/lib/malloc/map_anon.h @@ -34,4 +34,8 @@ void *tor_mmap_anonymous(size_t sz, unsigned flags); void tor_munmap_anonymous(void *mapping, size_t sz); +#ifdef TOR_UNIT_TESTS +unsigned get_last_anon_map_noinherit(void); +#endif + #endif /* !defined(TOR_MAP_ANON_H) */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 7a2708c54..4990aa709 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6165,8 +6165,8 @@ static void test_util_map_anon_nofork(void *arg) { (void)arg; -#if !defined(HAVE_MADVISE) && !defined(HAVE_MINHERIT) - /* The operating system doesn't support this. */ +#ifdef _WIN32 + /* The operating system doesn't support forking. */ tt_skip(); done: ; @@ -6182,6 +6182,7 @@ test_util_map_anon_nofork(void *arg) tor_munmap_anonymous(ptr, sz); ptr = tor_mmap_anonymous(sz, ANONMAP_NOINHERIT); + int outcome = get_last_anon_map_noinherit(); tt_ptr_op(ptr, OP_NE, 0); memset(ptr, 0xd0, sz); @@ -6202,15 +6203,30 @@ test_util_map_anon_nofork(void *arg) pipefd[1] = -1; char buf[1]; ssize_t r = read(pipefd[0], buf, 1); -#if defined(INHERIT_ZERO) || defined(MADV_WIPEONFORK) - tt_int_op((int)r, OP_EQ, 1); // child should send us a byte. - tt_int_op(buf[0], OP_EQ, 0); -#else - tt_int_op(r, OP_LE, 0); // child said nothing; it should have crashed. -#endif + + if (outcome == 2) { + // We should be seeing clear-on-fork behavior. + tt_int_op((int)r, OP_EQ, 1); // child should send us a byte. + tt_int_op(buf[0], OP_EQ, 0); // that byte should be zero. + } else if (outcome == 1) { + // We should be seeing noinherit behavior. + tt_int_op(r, OP_LE, 0); // child said nothing; it should have crashed. + } else { + // noinherit isn't implemented. + tt_int_op(outcome, OP_EQ, 0); + tt_int_op((int)r, OP_EQ, 1); // child should send us a byte. + tt_int_op(buf[0], OP_EQ, 0xd0); // that byte should what we set it to. + } + int ws; waitpid(child, &ws, 0); + if (outcome == 0) { + /* Call this test "skipped", not "passed", since noinherit wasn't + * implemented. */ + tt_skip(); + } + done: tor_munmap_anonymous(ptr, sz); if (pipefd[0] >= 0) { @@ -6360,6 +6376,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(get_unquoted_path, 0), UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), - UTIL_TEST(map_anon_nofork, TT_SKIP /* See bug #29535 */), + UTIL_TEST(map_anon_nofork, 0), END_OF_TESTCASES };

1 0

[tor/master] Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ()
by asn＠torproject.org 04 Mar '19

04 Mar '19

commit c142e3d1e65c22891c19d71541c8084532099183 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Feb 27 13:54:23 2019 -0500 Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ() --- changes/bug17357 | 7 +++++++ src/feature/rend/rendservice.c | 26 ++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/changes/bug17357 b/changes/bug17357 new file mode 100644 index 000000000..1188b65fd --- /dev/null +++ b/changes/bug17357 @@ -0,0 +1,7 @@ + o Minor bugfixes (onion services): + - If we are relaunching a circuit to a rendevous service in + rend_service_relaunch_rendezvous() and hs_service_requires_uptime_circ() + is true, the CIRCLAUNCH_NEED_UPTIME flag is added to the circuit. + Previously, we only set this flag when we received a INTRODUCE2 + cell in rend_service_receive_introduction(). Fixes bug 17357; + bugfix on 0.4.0.2-alpha. Patch by Neel Chauhan diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 5ee084b0b..73edcaccf 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3012,6 +3012,10 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) { origin_circuit_t *newcirc; cpath_build_state_t *newstate, *oldstate; + const char *rend_pk_digest; + rend_service_t *service = NULL; + + int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL; tor_assert(oldcirc->base_.purpose == CIRCUIT_PURPOSE_S_CONNECT_REND); oldstate = oldcirc->build_state; @@ -3026,13 +3030,31 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) log_info(LD_REND,"Reattempting rendezvous circuit to '%s'", safe_str(extend_info_describe(oldstate->chosen_exit))); + /* Look up the service. */ + rend_pk_digest = (char *) rend_data_get_pk_digest(oldcirc->rend_data, NULL); + service = rend_service_get_by_pk_digest(rend_pk_digest); + + if (!service) { + char serviceid[REND_SERVICE_ID_LEN_BASE32+1]; + base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, + rend_pk_digest, REND_SERVICE_ID_LEN); + + log_warn(LD_BUG, "Internal error: Trying to relaunch a rendezvous circ " + "for an unrecognized service %s.", + safe_str_client(serviceid)); + return; + } + + if (hs_service_requires_uptime_circ(service->ports)) { + flags |= CIRCLAUNCH_NEED_UPTIME; + } + /* You'd think Single Onion Services would want to retry the rendezvous * using a direct connection. But if it's blocked by a firewall, or the * service is IPv6-only, or the rend point avoiding becoming a one-hop * proxy, we need a 3-hop connection. */ newcirc = circuit_launch_by_extend_info(CIRCUIT_PURPOSE_S_CONNECT_REND, - oldstate->chosen_exit, - CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL); + oldstate->chosen_exit, flags); if (!newcirc) { log_warn(LD_REND,"Couldn't relaunch rendezvous circuit to '%s'.",

1 0

[tor/master] Merge branch 'tor-github/pr/739'
by asn＠torproject.org 04 Mar '19

04 Mar '19

commit fe2552ad652e07cd2e654b3e91f7b24a1ce8200b Merge: 13e93bdfd c142e3d1e Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 4 18:52:19 2019 +0200 Merge branch 'tor-github/pr/739' changes/bug17357 | 7 +++++++ src/feature/rend/rendservice.c | 26 ++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 04 Mar '19

04 Mar '19

commit 30400906c710036755c2ab3179c551b1f9195092 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 4 15:45:34 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 925c046ec..f02b984f9 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1952,10 +1952,7 @@ msgid "" "href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\">operate a " "Tor relay</a>." msgstr "" -"Peut-être que votre société serait prête à <a class=\"hyperlinks links\" " -"target=\"_blank\" " -"href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\">utiliser " -"un relais Tor</a>." +"Peut-être que votre entreprise serait prête à exploiter un relais Tor</a>." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:604 msgid "" @@ -1998,13 +1995,13 @@ msgstr "Nous nous réservons le droit de refuser un don." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:630 msgid "To date though, we haven't exercised that right." -msgstr "Jusqu’à présent, cependant, nous n’avons pas exercé ce droit." +msgstr "Nous n’avons cependant encore jamais exercé ce droit." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:632 msgid "We are happy that a broad range of people use and support Tor." msgstr "" -"Nous sommes heureux qu’un large éventail de personnes utilisent et " -"soutiennent Tor." +"Nous sommes ravis qu’un large éventail de personnes utilisent et soutiennent" +" Tor." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:638 msgid "I have more questions." @@ -2027,8 +2024,8 @@ msgid "" "We will try to answer you, and we'll also post your question (and the " "answer) here." msgstr "" -"Nous essaierons de vous répondre, et nous afficherons également votre " -"question (et la réponse) ici." +"Nous essaierons de vous répondre et nous publierons également votre question" +" (et la réponse) ici." #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:29 msgid "" @@ -2044,11 +2041,11 @@ msgstr "Coupe" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:40 msgid "Select Fit" -msgstr "Choisir la coupe" +msgstr "Séléctionner la coupe" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:44 msgid "Slim" -msgstr "Ajusté" +msgstr "Ajustée" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:48 msgid "Classic" @@ -2056,7 +2053,7 @@ msgstr "Classique" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:56 msgid "European" -msgstr "Européen" +msgstr "Européenne" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:66 msgid "Size"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 04 Mar '19

04 Mar '19

commit 3bde563c10c95ede210dd04ec0abd2c65371d096 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 4 15:45:27 2019 +0000 Update translations for donatepages-messagespot --- locale/fr/LC_MESSAGES/messages.po | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 925c046ec..f02b984f9 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1952,10 +1952,7 @@ msgid "" "href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\">operate a " "Tor relay</a>." msgstr "" -"Peut-être que votre société serait prête à <a class=\"hyperlinks links\" " -"target=\"_blank\" " -"href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\">utiliser " -"un relais Tor</a>." +"Peut-être que votre entreprise serait prête à exploiter un relais Tor</a>." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:604 msgid "" @@ -1998,13 +1995,13 @@ msgstr "Nous nous réservons le droit de refuser un don." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:630 msgid "To date though, we haven't exercised that right." -msgstr "Jusqu’à présent, cependant, nous n’avons pas exercé ce droit." +msgstr "Nous n’avons cependant encore jamais exercé ce droit." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:632 msgid "We are happy that a broad range of people use and support Tor." msgstr "" -"Nous sommes heureux qu’un large éventail de personnes utilisent et " -"soutiennent Tor." +"Nous sommes ravis qu’un large éventail de personnes utilisent et soutiennent" +" Tor." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:638 msgid "I have more questions." @@ -2027,8 +2024,8 @@ msgid "" "We will try to answer you, and we'll also post your question (and the " "answer) here." msgstr "" -"Nous essaierons de vous répondre, et nous afficherons également votre " -"question (et la réponse) ici." +"Nous essaierons de vous répondre et nous publierons également votre question" +" (et la réponse) ici." #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:29 msgid "" @@ -2044,11 +2041,11 @@ msgstr "Coupe" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:40 msgid "Select Fit" -msgstr "Choisir la coupe" +msgstr "Séléctionner la coupe" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:44 msgid "Slim" -msgstr "Ajusté" +msgstr "Ajustée" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:48 msgid "Classic" @@ -2056,7 +2053,7 @@ msgstr "Classique" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:56 msgid "European" -msgstr "Européen" +msgstr "Européenne" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:66 msgid "Size"

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 04 Mar '19

04 Mar '19

commit 50009039e802bfac6be66c4b07d345d50374e0d7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 4 15:15:38 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 99dd64d54..925c046ec 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1942,7 +1942,7 @@ msgid "" "Your company may operate a corporate foundation that gives out grants, and " "if so, you should encourage it to fund us." msgstr "" -"Votre entreprise peut exploiter une fondation d’entreprise qui accorde des " +"Votre entreprise peut gérer une fondation d’entreprise qui accorde des " "subventions et, si c’est le cas, vous devriez l’encourager à nous financer." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:602

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 04 Mar '19

04 Mar '19

commit f41742933560ee95af49ef1fa00da15420578fa8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 4 15:15:31 2019 +0000 Update translations for donatepages-messagespot --- locale/fr/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 99dd64d54..925c046ec 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1942,7 +1942,7 @@ msgid "" "Your company may operate a corporate foundation that gives out grants, and " "if so, you should encourage it to fund us." msgstr "" -"Votre entreprise peut exploiter une fondation d’entreprise qui accorde des " +"Votre entreprise peut gérer une fondation d’entreprise qui accorde des " "subventions et, si c’est le cas, vous devriez l’encourager à nous financer." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:602

1 0

[onionperf/master] Handles get_ip_address() output in case of dns failure
by irl＠torproject.org 04 Mar '19

04 Mar '19

commit 2ea0296ebe7accd9842589902c0c6668cd8b8d5e Author: Ana Custura <ana(a)nestat.org.uk> Date: Thu Feb 28 15:52:10 2019 +0100 Handles get_ip_address() output in case of dns failure --- onionperf/util.py | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/onionperf/util.py b/onionperf/util.py index d4aebcf..c35e638 100644 --- a/onionperf/util.py +++ b/onionperf/util.py @@ -129,10 +129,29 @@ def find_ip_address_local(): return ip_address def get_ip_address(): - data = urllib.urlopen('https://check.torproject.org/').read() - ip_address = find_ip_address_url(data) - if ip_address is None: - ip_address = find_ip_address_local() + """ + Determines the public IPv4 address of the vantage point using the + check.torproject.org service. If it is not possible to reach the service, + or to parse the result recieved, it will fall back to determining the local + IP address used for outbound connections. + """ + ip_address = None + try: + data = urllib.urlopen('https://check.torproject.org/').read() + ip_address = find_ip_address_url(data) + if ip_address is None: + logging.error( + "Unable to determine IP address from check.torproject.org. " + "The site was successfully contacted but the result could " + "not be parsed. Maybe the service is down? Falling back to " + "finding your IP locally...") + ip_address = find_ip_address_local() + except IOError: + logging.warning( + "An IOError occured attempting to contact check.torproject.org. " + "This will affect measurements unless your machine has a public " + "IP address. Falling back to finding your IP locally...") + ip_address = find_ip_address_local() return ip_address def get_random_free_port():

1 0

[onionperf/master] Adds support for getting extra configuration from an env variable.
by irl＠torproject.org 04 Mar '19

04 Mar '19

commit 95df6d097255579d13b31abef4cb68259160a097 Author: Ana Custura <ana(a)nestat.org.uk> Date: Thu Feb 28 16:15:06 2019 +0100 Adds support for getting extra configuration from an env variable. --- onionperf/measurement.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 0318ea3..17cc399 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -171,6 +171,7 @@ class Measurement(object): self.hs_service_id = None self.hs_v3_service_id = None self.www_docroot = "{0}/htdocs".format(self.datadir_path) + self.base_config = os.environ['BASETORRC'] if "BASETORRC" in os.environ else "" def run(self, do_onion=True, do_inet=True, client_tgen_listen_port=58888, client_tgen_connect_ip='0.0.0.0', client_tgen_connect_port=8080, client_tor_ctl_port=59050, client_tor_socks_port=59000, server_tgen_listen_port=8080, server_tor_ctl_port=59051, server_tor_socks_port=59001): @@ -358,7 +359,7 @@ class Measurement(object): tor_datadir = "{0}/tor-{1}".format(self.datadir_path, name) if not os.path.exists(tor_datadir): os.makedirs(tor_datadir) - tor_config_template = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort {0}\nSocksPort {1}\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ + tor_config_template = self.base_config + "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort {0}\nSocksPort {1}\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nUseEntryGuards 0\nDataDirectory {2}\nLog INFO stdout\n" tor_config = tor_config_template.format(control_port, socks_port, tor_datadir)

1 0