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

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5
by asn＠torproject.org 17 Mar '21

17 Mar '21

commit 59bbf8cde9144ee5c8d060959e723a4bedfd6bb8 Merge: d66178c7b7 9409c7f2f5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 17 13:43:38 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5 changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-)

1 0

[tor/master] Don't warn about missing guard state if controller picked first hop
by asn＠torproject.org 17 Mar '21

17 Mar '21

commit 9409c7f2f52f192eaf497c56daa485d75358de65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 8 13:41:20 2021 -0500 Don't warn about missing guard state if controller picked first hop See comments about why this needs a new flag and we can't just use CIRCUIT_PURPOSE_CONTROLLER. Fixes #40285; bugfix on 0.3.2.1-alpha. --- changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/changes/bug40285_045 b/changes/bug40285_045 new file mode 100644 index 0000000000..db4f73cde0 --- /dev/null +++ b/changes/bug40285_045 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller): + - Fix a "BUG" warning that would appear when a controller chooses the + first hop for a circuit, and that circuit completes. Fixes + bug 40285; bugfix on 0.3.2.1-alpha. diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index c0c918abe4..78501c0aa2 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -881,14 +881,22 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, } /** - * Return true iff purpose is a purpose for a circuit which is - * allowed to have no guard configured, even if the circuit is multihop + * Return true iff circ is allowed + * to have no guard configured, even if the circuit is multihop * and guards are enabled. */ static int -circuit_purpose_may_omit_guard(int purpose) +circuit_may_omit_guard(const origin_circuit_t *circ) { - switch (purpose) { + if (BUG(!circ)) + return 0; + + if (circ->first_hop_from_controller) { + /* The controller picked the first hop: that bypasses the guard system. */ + return 1; + } + + switch (circ->base_.purpose) { case CIRCUIT_PURPOSE_TESTING: case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: /* Testing circuits may omit guards because they're measuring @@ -1019,7 +1027,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) guard_usable_t r; if (! circ->guard_state) { if (circuit_get_cpath_len(circ) != 1 && - ! circuit_purpose_may_omit_guard(circ->base_.purpose) && + ! circuit_may_omit_guard(circ) && get_options()->UseEntryGuards) { log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no " "guard state", diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 3178e6cd0d..bd4a117e26 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -118,7 +118,8 @@ * bandwidth measurement, reachability test and address discovery from an * authority using the NETINFO cell. */ #define CIRCUIT_PURPOSE_TESTING 21 -/** A controller made this circuit and Tor should not use it. */ +/** A controller made this circuit and Tor should not cannibalize it or attach + * streams to it without explicitly being told. */ #define CIRCUIT_PURPOSE_CONTROLLER 22 /** This circuit is used for path bias probing only */ #define CIRCUIT_PURPOSE_PATH_BIAS_TESTING 23 diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h index a45a6573dc..c40e84aed8 100644 --- a/src/core/or/origin_circuit_st.h +++ b/src/core/or/origin_circuit_st.h @@ -170,6 +170,18 @@ struct origin_circuit_t { * not try to negotiate further circuit padding. */ unsigned padding_negotiation_failed : 1; + /** + * If this flag is set, then a controller chose the first hop of this + * circuit's path, and it's okay to ignore checks that we'd usually do + * on this circuit's first hop. + * + * This flag is distinct from the CIRCUIT_PURPOSE_CONTROLLER purpose: the + * purpose indicates _what tor can use the circuit for_. Controller-created + * circuits can still have the CIRCUIT_PURPOSE_GENERAL purpose if Tor is + * allowed to attach streams to them. + */ + unsigned first_hop_from_controller : 1; + /** * Tristate variable to guard against pathbias miscounting * due to circuit purpose transitions changing the decision diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 5b75c24692..0456d709f5 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -819,6 +819,7 @@ handle_control_extendcircuit(control_connection_t *conn, if (zero_circ) { /* start a new circuit */ circ = origin_circuit_init(intended_purpose, 0); + circ->first_hop_from_controller = 1; } /* now circ refers to something that is ready to be extended */

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5
by asn＠torproject.org 17 Mar '21

17 Mar '21

commit 59bbf8cde9144ee5c8d060959e723a4bedfd6bb8 Merge: d66178c7b7 9409c7f2f5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 17 13:43:38 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5 changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.5] Don't warn about missing guard state if controller picked first hop
by asn＠torproject.org 17 Mar '21

17 Mar '21

commit 9409c7f2f52f192eaf497c56daa485d75358de65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 8 13:41:20 2021 -0500 Don't warn about missing guard state if controller picked first hop See comments about why this needs a new flag and we can't just use CIRCUIT_PURPOSE_CONTROLLER. Fixes #40285; bugfix on 0.3.2.1-alpha. --- changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/changes/bug40285_045 b/changes/bug40285_045 new file mode 100644 index 0000000000..db4f73cde0 --- /dev/null +++ b/changes/bug40285_045 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller): + - Fix a "BUG" warning that would appear when a controller chooses the + first hop for a circuit, and that circuit completes. Fixes + bug 40285; bugfix on 0.3.2.1-alpha. diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index c0c918abe4..78501c0aa2 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -881,14 +881,22 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, } /** - * Return true iff purpose is a purpose for a circuit which is - * allowed to have no guard configured, even if the circuit is multihop + * Return true iff circ is allowed + * to have no guard configured, even if the circuit is multihop * and guards are enabled. */ static int -circuit_purpose_may_omit_guard(int purpose) +circuit_may_omit_guard(const origin_circuit_t *circ) { - switch (purpose) { + if (BUG(!circ)) + return 0; + + if (circ->first_hop_from_controller) { + /* The controller picked the first hop: that bypasses the guard system. */ + return 1; + } + + switch (circ->base_.purpose) { case CIRCUIT_PURPOSE_TESTING: case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: /* Testing circuits may omit guards because they're measuring @@ -1019,7 +1027,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) guard_usable_t r; if (! circ->guard_state) { if (circuit_get_cpath_len(circ) != 1 && - ! circuit_purpose_may_omit_guard(circ->base_.purpose) && + ! circuit_may_omit_guard(circ) && get_options()->UseEntryGuards) { log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no " "guard state", diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 3178e6cd0d..bd4a117e26 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -118,7 +118,8 @@ * bandwidth measurement, reachability test and address discovery from an * authority using the NETINFO cell. */ #define CIRCUIT_PURPOSE_TESTING 21 -/** A controller made this circuit and Tor should not use it. */ +/** A controller made this circuit and Tor should not cannibalize it or attach + * streams to it without explicitly being told. */ #define CIRCUIT_PURPOSE_CONTROLLER 22 /** This circuit is used for path bias probing only */ #define CIRCUIT_PURPOSE_PATH_BIAS_TESTING 23 diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h index a45a6573dc..c40e84aed8 100644 --- a/src/core/or/origin_circuit_st.h +++ b/src/core/or/origin_circuit_st.h @@ -170,6 +170,18 @@ struct origin_circuit_t { * not try to negotiate further circuit padding. */ unsigned padding_negotiation_failed : 1; + /** + * If this flag is set, then a controller chose the first hop of this + * circuit's path, and it's okay to ignore checks that we'd usually do + * on this circuit's first hop. + * + * This flag is distinct from the CIRCUIT_PURPOSE_CONTROLLER purpose: the + * purpose indicates _what tor can use the circuit for_. Controller-created + * circuits can still have the CIRCUIT_PURPOSE_GENERAL purpose if Tor is + * allowed to attach streams to them. + */ + unsigned first_hop_from_controller : 1; + /** * Tristate variable to guard against pathbias miscounting * due to circuit purpose transitions changing the decision diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 5b75c24692..0456d709f5 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -819,6 +819,7 @@ handle_control_extendcircuit(control_connection_t *conn, if (zero_circ) { /* start a new circuit */ circ = origin_circuit_init(intended_purpose, 0); + circ->first_hop_from_controller = 1; } /* now circ refers to something that is ready to be extended */

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5
by asn＠torproject.org 17 Mar '21

17 Mar '21

commit 59bbf8cde9144ee5c8d060959e723a4bedfd6bb8 Merge: d66178c7b7 9409c7f2f5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 17 13:43:38 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5 changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by asn＠torproject.org 17 Mar '21

17 Mar '21

commit ea781dc44fe9423af4197cfc1e07825d4366e491 Merge: aa49562a05 59bbf8cde9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 17 13:43:47 2021 +0200 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.5] Don't warn about missing guard state if controller picked first hop
by asn＠torproject.org 17 Mar '21

17 Mar '21

commit 9409c7f2f52f192eaf497c56daa485d75358de65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 8 13:41:20 2021 -0500 Don't warn about missing guard state if controller picked first hop See comments about why this needs a new flag and we can't just use CIRCUIT_PURPOSE_CONTROLLER. Fixes #40285; bugfix on 0.3.2.1-alpha. --- changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/changes/bug40285_045 b/changes/bug40285_045 new file mode 100644 index 0000000000..db4f73cde0 --- /dev/null +++ b/changes/bug40285_045 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller): + - Fix a "BUG" warning that would appear when a controller chooses the + first hop for a circuit, and that circuit completes. Fixes + bug 40285; bugfix on 0.3.2.1-alpha. diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index c0c918abe4..78501c0aa2 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -881,14 +881,22 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, } /** - * Return true iff purpose is a purpose for a circuit which is - * allowed to have no guard configured, even if the circuit is multihop + * Return true iff circ is allowed + * to have no guard configured, even if the circuit is multihop * and guards are enabled. */ static int -circuit_purpose_may_omit_guard(int purpose) +circuit_may_omit_guard(const origin_circuit_t *circ) { - switch (purpose) { + if (BUG(!circ)) + return 0; + + if (circ->first_hop_from_controller) { + /* The controller picked the first hop: that bypasses the guard system. */ + return 1; + } + + switch (circ->base_.purpose) { case CIRCUIT_PURPOSE_TESTING: case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: /* Testing circuits may omit guards because they're measuring @@ -1019,7 +1027,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) guard_usable_t r; if (! circ->guard_state) { if (circuit_get_cpath_len(circ) != 1 && - ! circuit_purpose_may_omit_guard(circ->base_.purpose) && + ! circuit_may_omit_guard(circ) && get_options()->UseEntryGuards) { log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no " "guard state", diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 3178e6cd0d..bd4a117e26 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -118,7 +118,8 @@ * bandwidth measurement, reachability test and address discovery from an * authority using the NETINFO cell. */ #define CIRCUIT_PURPOSE_TESTING 21 -/** A controller made this circuit and Tor should not use it. */ +/** A controller made this circuit and Tor should not cannibalize it or attach + * streams to it without explicitly being told. */ #define CIRCUIT_PURPOSE_CONTROLLER 22 /** This circuit is used for path bias probing only */ #define CIRCUIT_PURPOSE_PATH_BIAS_TESTING 23 diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h index a45a6573dc..c40e84aed8 100644 --- a/src/core/or/origin_circuit_st.h +++ b/src/core/or/origin_circuit_st.h @@ -170,6 +170,18 @@ struct origin_circuit_t { * not try to negotiate further circuit padding. */ unsigned padding_negotiation_failed : 1; + /** + * If this flag is set, then a controller chose the first hop of this + * circuit's path, and it's okay to ignore checks that we'd usually do + * on this circuit's first hop. + * + * This flag is distinct from the CIRCUIT_PURPOSE_CONTROLLER purpose: the + * purpose indicates _what tor can use the circuit for_. Controller-created + * circuits can still have the CIRCUIT_PURPOSE_GENERAL purpose if Tor is + * allowed to attach streams to them. + */ + unsigned first_hop_from_controller : 1; + /** * Tristate variable to guard against pathbias miscounting * due to circuit purpose transitions changing the decision diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 5b75c24692..0456d709f5 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -819,6 +819,7 @@ handle_control_extendcircuit(control_connection_t *conn, if (zero_circ) { /* start a new circuit */ circ = origin_circuit_init(intended_purpose, 0); + circ->first_hop_from_controller = 1; } /* now circ refers to something that is ready to be extended */

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 17 Mar '21

17 Mar '21

commit 8b7051381c8509a72e9fb43c1fd03b678463fc8e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 17 01:15:11 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index 0755505d14..7d7823c985 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6,11 +6,11 @@ # David Figuera <dfb(a)fastmail.com>, 2020 # cacu <carlosm2(a)riseup.net>, 2020 # Dylan Boren <dylanmboren(a)gmail.com>, 2020 -# Burro Moro <burromoro(a)riseup.net>, 2021 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2021 # Fred Shen <niclored(a)hotmail.com>, 2021 # Zuhualime Akoochimoya, 2021 # Emma Peel, 2021 +# Burro Moro <burromoro(a)riseup.net>, 2021 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-05 08:54+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: Burro Moro <burromoro(a)riseup.net>, 2021\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4032,6 +4032,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-01.png\" alt=\"Onion Services: Step 1\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-01.png\" alt=\"Onion Services: Step 1\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4082,6 +4084,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-02.png\" alt=\"Onion Services: Step 2\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-02.png\" alt=\"Onion Services: Step 2\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4108,6 +4112,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-03.png\" alt=\"Onion Services: Step 3\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-03.png\" alt=\"Onion Services: Step 3\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4149,6 +4155,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-04.png\" alt=\"Onion Services: Step 4\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-04.png\" alt=\"Onion Services: Step 4\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4183,6 +4191,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-05.png\" alt=\"Onion Services: Step 5\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-05.png\" alt=\"Onion Services: Step 5\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4209,6 +4219,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-06.png\" alt=\"Onion Services: Step 6\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-06.png\" alt=\"Onion Services: Step 6\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4229,6 +4241,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-07.png\" alt=\"Onion Services: Step 7\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-07.png\" alt=\"Onion Services: Step 7\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4267,6 +4281,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-08.png\" alt=\"Onion Services: Step 8\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-08.png\" alt=\"Onion Services: Step 8\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -4300,6 +4316,8 @@ msgid "" "<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" "/onion-service-09.png\" alt=\"Onion Services: Step 9\">" msgstr "" +"<img class=\"col-lg-8\" src=\"../../static/images/onion-services/overview" +"/onion-service-09.png\" alt=\"Onion Services: Step 9\">" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 17 Mar '21

17 Mar '21

commit 388c372638fb00655e64fa9e12ec18b132bf9148 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 17 00:46:41 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es-AR.po | 15 +++++++++++++-- contents+es.po | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 5fc64ea865..df2554db64 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3364,6 +3364,8 @@ msgstr "* Deslizá hacia abajo y pulsá en \"Ajustes de Seguridad\"." #: (content/mobile-tor/contents+en.lrtopic.body) msgid "* You can now select an option i.e. Standard, Safer or Safest." msgstr "" +"* Ahora podés seleccionar una opción, es decir, estándar, seguro o más " +"seguro." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3386,6 +3388,8 @@ msgid "" "This method assumes that you have either Google Play or F-Droid installed on" " your mobile device." msgstr "" +"Este método asume que tenés instalado Google Play o F-Droid en tu " +"dispositivo móvil." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3554,6 +3558,8 @@ msgid "" "On the next screen, select Tor Browser and finally tap on the \"Uninstall\" " "button." msgstr "" +"En la siguiente pantalla, seleccioná Navegador Tor y finalmente haz clic en " +"el botón \"Actualizar\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3577,6 +3583,8 @@ msgid "" "Depending on your mobile device's brand, navigate to Settings > Apps, then " "select Tor Browser and tap on the \"Uninstall\" button." msgstr "" +"Dependiendo de la marca de tu dispositivo móvil, vé a Configuración > Apps, " +"luego seleccioná Navegador Tor y tocá el botón \"Desinstalar\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3593,7 +3601,7 @@ msgid "" "* You can't see your Tor circuit. " "[#25764](https://gitlab.torproject.org/tpo/applications/torbutton/-/issues/25764)" msgstr "" -"* No puedes ver tu circuito Tor. " +"* No podés ver tu circuito Tor. " "[#25764](https://gitlab.torproject.org/tpo/applications/torbutton/-/issues/25764)" #: https//tb-manual.torproject.org/mobile-tor/ @@ -3614,7 +3622,7 @@ msgid "" "[#27987](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/27987)" msgstr "" -"* No puedes tomar capturas de pantalla mientras usas el Navegador Tor para " +"* No podés tomar capturas de pantalla mientras usas el Navegador Tor para " "Android. [#27987](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/27987)" @@ -3625,6 +3633,9 @@ msgid "" "[#40283](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/40283)" msgstr "" +"* No se pueden subir archivos con el navegador Tor para Android. " +"[#40283](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/40283)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) diff --git a/contents+es.po b/contents+es.po index f626ea9e10..f2f214cb69 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3128,6 +3128,8 @@ msgid "" "The first screen will tell you about the status of the Tor Network and " "provide you the option to configure a Bridge ('Config Bridge')." msgstr "" +"La primera pantalla te informará sobre el estado de la red Tor y te " +"proporcionará la opción de configurar un Puente ('Config Bridge')." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3136,6 +3138,9 @@ msgid "" "connect to the Tor network and no other solutions have worked, tap on " "'Config Bridge'." msgstr "" +"Si sabes que tu conexión está censurada, o has intentado y no has podido " +"conectarte a la red Tor y ninguna otra solución ha funcionado, pulsa 'Config" +" Bridge'." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3187,6 +3192,8 @@ msgid "" "The first screen tells you about the status of the Tor network. Tap on " "'Config Bridge' to configure a bridge." msgstr "" +"La primera pantalla te informa sobre el estado de la red Tor. Pulsa en " +"'Config Bridge' para configurar un puente." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3373,6 +3380,8 @@ msgstr "* Desplázate hacia abajo y pulsa en \"Configuraciones de Seguridad\"." #: (content/mobile-tor/contents+en.lrtopic.body) msgid "* You can now select an option i.e. Standard, Safer or Safest." msgstr "" +"* Ahora puedes seleccionar una opción, es decir, estándar, seguro o más " +"seguro." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3444,6 +3453,9 @@ msgid "" "/android-update-f-droid.png\" alt=\"Updating Tor Browser for Android on " "F-Droid\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-update-f-droid.png\" alt=\"Updating Tor Browser for Android on " +"F-Droid\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3570,6 +3582,9 @@ msgid "" "/android-uninstall-f-droid.png\" alt=\"Uninstalling Tor Browser for Android " "on F-Droid\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-uninstall-f-droid.png\" alt=\"Uninstalling Tor Browser for Android " +"on F-Droid\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3602,6 +3617,8 @@ msgid "" "Depending on your mobile device's brand, navigate to Settings > Apps, then " "select Tor Browser and tap on the \"Uninstall\" button." msgstr "" +"Dependiendo de la marca de tu dispositivo móvil, ve a Configuración > Apps, " +"luego selecciona Navegador Tor y toca el botón \"Desinstalar\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3639,6 +3656,9 @@ msgid "" "[#27987](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/27987)" msgstr "" +"* No puedes tomar capturas de pantalla mientras usas el navegador Tor para " +"Android. [#27987](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/27987)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3647,6 +3667,9 @@ msgid "" "[#40283](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/40283)" msgstr "" +"* No se pueden subir archivos con el Navegador Tor para Android. " +"[#40283](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/40283)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 17 Mar '21

17 Mar '21

commit d8da2471cc30f147aa57f419ba1c3a9eddc62ca6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 17 00:16:52 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es-AR.po | 24 +++++++++++++++++++++++- contents+es.po | 25 ++++++++++++++++++++----- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 17143d2fb5..5fc64ea865 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3593,6 +3593,8 @@ msgid "" "* You can't see your Tor circuit. " "[#25764](https://gitlab.torproject.org/tpo/applications/torbutton/-/issues/25764)" msgstr "" +"* No puedes ver tu circuito Tor. " +"[#25764](https://gitlab.torproject.org/tpo/applications/torbutton/-/issues/25764)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3601,6 +3603,9 @@ msgid "" "[#31814](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/31814)" msgstr "" +"* El Navegador Tor para Android no se conecta cuando se mueve a la tarjeta " +"SD. [#31814](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/31814)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3609,6 +3614,9 @@ msgid "" "[#27987](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/27987)" msgstr "" +"* No puedes tomar capturas de pantalla mientras usas el Navegador Tor para " +"Android. [#27987](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/27987)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3646,6 +3654,11 @@ msgid "" "browsers, and Orfox was crucial for helping people circumvent censorship and" " access blocked sites and critical resources." msgstr "" +"Durante los siguientes tres años, Orfox mejoró continuamente y se convirtió " +"en una forma popular para que las personas naveguen por Internet con más " +"privacidad que los navegadores estándar, y Orfox fue crucial para ayudar a " +"las personas a eludir la censura y acceder a sitios bloqueados y recursos " +"críticos." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3654,6 +3667,9 @@ msgid "" "tor-browser-android) after the official Tor Browser for Android was " "released." msgstr "" +"En 2019, [Orfox desapareció] (https://blog.torproject.org/orfox-paved-way-" +"tor-browser-android) después de que se lanzara el Navegador Tor oficial para" +" Android." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3671,7 +3687,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Orbot uses Tor to encrypt your Internet traffic." -msgstr "" +msgstr "Orbot usa Tor para cifrar tu tráfico de Internet." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3679,6 +3695,8 @@ msgid "" "Then you can use it with other apps installed on your mobile device to " "circumvent censorship and protect against surveillance." msgstr "" +"Luego, podés usarlo con otras aplicaciones instaladas en tu dispositivo " +"móvil para eludir la censura y protegerse contra la vigilancia." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3763,6 +3781,10 @@ msgid "" "Phones but in case of the newer Microsoft-branded/promoted phones, same " "steps on [Tor Browser on Android](#tor-browser-for-android) can be followed." msgstr "" +"Actualmente no existe un método compatible para ejecutar Tor en teléfonos " +"Windows más antiguos, pero en el caso de los teléfonos promocionados / de la" +" marca Microsoft más nuevos, podés seguir los mismos pasos en [Navegador Tor" +" en Android] (#tor-browser-for-android)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.title) diff --git a/contents+es.po b/contents+es.po index 78e4d2ac1d..f626ea9e10 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3618,6 +3618,8 @@ msgid "" "* You can't see your Tor circuit. " "[#25764](https://gitlab.torproject.org/tpo/applications/torbutton/-/issues/25764)" msgstr "" +"* No puedes ver tu circuito Tor. " +"[#25764](https://gitlab.torproject.org/tpo/applications/torbutton/-/issues/25764)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3626,6 +3628,9 @@ msgid "" "[#31814](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/31814)" msgstr "" +"* El Navegador Tor para Android no se conecta cuando se mueve a la tarjeta " +"SD. [#31814](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/31814)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3670,10 +3675,11 @@ msgid "" "browsers, and Orfox was crucial for helping people circumvent censorship and" " access blocked sites and critical resources." msgstr "" -"Durante los siguientes tres años, Orfox fue mejorando y convirtiéndose en " -"una forma muy popular de navegar por internet con más privacidad que los " -"navegadores estándares, y fue crucial para las personas en circunstancias de" -" censura y para acceder a sitios bloqueados y con recursos críticos." +"Durante los siguientes tres años, Orfox mejoró continuamente y se convirtió " +"en una forma popular para que las personas naveguen por Internet con más " +"privacidad que los navegadores estándar, y Orfox fue crucial para ayudar a " +"las personas a eludir la censura y acceder a sitios bloqueados y recursos " +"críticos." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3682,6 +3688,9 @@ msgid "" "tor-browser-android) after the official Tor Browser for Android was " "released." msgstr "" +"En 2019, [Orfox desapareció] (https://blog.torproject.org/orfox-paved-way-" +"tor-browser-android) después de que se lanzara el Navegador Tor oficial para" +" Android." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3699,7 +3708,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Orbot uses Tor to encrypt your Internet traffic." -msgstr "" +msgstr "Orbot usa Tor para cifrar tu tráfico de Internet." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3707,6 +3716,8 @@ msgid "" "Then you can use it with other apps installed on your mobile device to " "circumvent censorship and protect against surveillance." msgstr "" +"Luego, puedes usarlo con otras aplicaciones instaladas en tu dispositivo " +"móvil para eludir la censura y protegerse contra la vigilancia." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3790,6 +3801,10 @@ msgid "" "Phones but in case of the newer Microsoft-branded/promoted phones, same " "steps on [Tor Browser on Android](#tor-browser-for-android) can be followed." msgstr "" +"Actualmente no existe un método compatible para ejecutar Tor en teléfonos " +"Windows más antiguos, pero en el caso de los teléfonos promocionados / de la" +" marca Microsoft más nuevos, se pueden seguir los mismos pasos en [Navegador" +" Tor en Android] (#tor-browser-for-android)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.title)

1 0