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

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit b98aad5be2a96a09007dfaec0ad0b743255d9c22 Merge: d6b6cd7cd7 0135fb028c Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 21 12:35:36 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40337 | 16 ++++++++++++++++ doc/man/tor.1.txt | 5 +++++ src/app/config/config.c | 2 ++ src/app/config/or_options_st.h | 4 ++++ src/app/config/testnet.inc | 1 + src/feature/relay/router.c | 5 ++++- src/feature/stats/bwhist.c | 19 ++++++++++++++----- src/feature/stats/bwhist.h | 2 +- src/test/test_relay.c | 4 ++-- 9 files changed, 49 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 0135fb028c8ca0ce310009f20efef89e53a36f2c Merge: 5717b88bcb 265cca935a Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 21 12:35:26 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5 changes/ticket40337 | 16 ++++++++++++++++ doc/man/tor.1.txt | 5 +++++ src/app/config/config.c | 2 ++ src/app/config/or_options_st.h | 4 ++++ src/app/config/testnet.inc | 1 + src/feature/relay/router.c | 5 ++++- src/feature/stats/bwhist.c | 19 ++++++++++++++----- src/feature/stats/bwhist.h | 2 +- src/test/test_relay.c | 4 ++-- 9 files changed, 49 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.6] Add a MinTimeToReportBandwidth option; make it 0 for testing networks.
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 2ae24d003d1d12e8e202748c4398d7438e4a65d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 17 08:45:37 2021 -0400 Add a MinTimeToReportBandwidth option; make it 0 for testing networks. This option changes the time for which a bandwidth measurement period must have been in progress before we include it when reporting our observed bandwidth in our descriptors. Without this option, we only consider a time period towards our maximum if it has been running for a full day. Obviously, that's unacceptable for testing networks, where we'd like to get results as soon as possible. For non-testing networks, I've put a (somewhat arbitrary) 2-hour minimum on the option, since there are traffic analysis concerns with immediate reporting here. Closes #40337. --- changes/ticket40337 | 12 ++++++++++++ doc/man/tor.1.txt | 7 +++++++ src/app/config/config.c | 8 ++++++++ src/app/config/config.h | 7 +++++++ src/app/config/or_options_st.h | 4 ++++ src/app/config/testnet.inc | 1 + src/feature/stats/bwhist.c | 19 ++++++++++++++----- src/feature/stats/bwhist.h | 2 +- src/test/test_relay.c | 4 ++-- 9 files changed, 56 insertions(+), 8 deletions(-) diff --git a/changes/ticket40337 b/changes/ticket40337 new file mode 100644 index 0000000000..f8f136a740 --- /dev/null +++ b/changes/ticket40337 @@ -0,0 +1,12 @@ + o Minor features (bandwidth reporting): + - Relays can now use the MinTimeToReportBandwidth option to change + the smallest amount of time over which they're willing to report + their observed maximum bandwidth. Previously, this was fixed + at 1 day. For safety, values under 2 hours are only supported on + testing networks. Part of a fix for ticket 40337. + + o Minor features (testing): + - Relays on testing networks now report their observed bandwidths + immediately from startup. Previously, they waited + until they had been running for a full day. Closes ticket + 40337. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index b57c6ec70a..af4ee494ef 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2448,6 +2448,13 @@ is non-zero): If we have more onionskins queued for processing than we can process in this amount of time, reject new ones. (Default: 1750 msec) +[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ **seconds**|**minutes**|**hours**:: + Do not report our measurements for our maximum observed bandwidth for any + time period that has lasted for less than this amount of time. + Setting this option too low can enable traffic analysis, and is + not permitted except on testing networks. Values over 1 day have + no effect. (Default: 1 day) + [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...:: Declare that this Tor relay is controlled or administered by a group or organization identical or similar to that of the other relays, defined by diff --git a/src/app/config/config.c b/src/app/config/config.c index fa74907b3d..9011f36735 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -563,6 +563,7 @@ static const config_var_t option_vars_[] = { V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), VPORT(MetricsPort), V(MetricsPortPolicy, LINELIST, NULL), + V(MinTimeToReportBandwidth, INTERVAL, "1 day"), VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), @@ -3711,6 +3712,13 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; } + if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW && + !options->TestingTorNetwork) { + log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; " + "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW); + options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW; + } + if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); diff --git a/src/app/config/config.h b/src/app/config/config.h index e95ef4a728..74e6942eb5 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -24,6 +24,13 @@ * expose more information than we're comfortable with. */ #define MIN_HEARTBEAT_PERIOD (30*60) +/** + * Lowest allowable value for MinTimeToReportBandwidth on a non-testing + * network; if this is too low we might report detail that is too + * fine-grained. + **/ +#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60) + /** Maximum default value for MaxMemInQueues, in bytes. */ #if SIZEOF_VOID_P >= 8 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30) diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 4364f145ed..efecc85d66 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -1082,6 +1082,10 @@ struct or_options_t { /** List of policy allowed to query the Metrics port. */ struct config_line_t *MetricsPortPolicy; + /** How far must we be into the current bandwidth-measurement period to + * report bandwidth observations from this period? */ + int MinTimeToReportBandwidth; + /** * Configuration objects for individual modules. * diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 00b307782b..527e0d00b1 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -19,6 +19,7 @@ { "TestingV3AuthInitialDistDelay", "20 seconds" }, { "TestingAuthDirTimeToLearnReachability", "0 minutes" }, { "MinUptimeHidServDirectoryV2", "0 minutes" }, +{ "MinTimeToReportBandwidth", "0 seconds" }, { "TestingServerDownloadInitialDelay", "0" }, { "TestingClientDownloadInitialDelay", "0" }, { "TestingServerConsensusDownloadInitialDelay", "0" }, diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c index 7cbc5f60a6..55a8f7c747 100644 --- a/src/feature/stats/bwhist.c +++ b/src/feature/stats/bwhist.c @@ -206,16 +206,24 @@ bwhist_note_dir_bytes_read(uint64_t num_bytes, time_t when) add_obs(dir_read_array, when, num_bytes); } -/** Helper: Return the largest value in b->maxima. (This is equal to the +/** + * Helper: Return the largest value in b->maxima. (This is equal to the * most bandwidth used in any NUM_SECS_ROLLING_MEASURE period for the last * NUM_SECS_BW_SUM_IS_VALID seconds.) + * + * Also include the current period if we have been observing it for + * at least min_observation_time seconds. */ STATIC uint64_t -find_largest_max(bw_array_t *b) +find_largest_max(bw_array_t *b, int min_observation_time) { int i; uint64_t max; - max=0; + time_t period_start = b->next_period - NUM_SECS_BW_SUM_INTERVAL; + if (b->cur_obs_time > period_start + min_observation_time) + max = b->max_total; + else + max = 0; for (i=0; i<NUM_TOTALS; ++i) { if (b->maxima[i]>max) max = b->maxima[i]; @@ -233,8 +241,9 @@ MOCK_IMPL(int, bwhist_bandwidth_assess,(void)) { uint64_t w,r; - r = find_largest_max(read_array); - w = find_largest_max(write_array); + int min_obs_time = get_options()->MinTimeToReportBandwidth; + r = find_largest_max(read_array, min_obs_time); + w = find_largest_max(write_array, min_obs_time); if (r>w) return (int)(((double)w)/NUM_SECS_ROLLING_MEASURE); else diff --git a/src/feature/stats/bwhist.h b/src/feature/stats/bwhist.h index f88b951447..01055df720 100644 --- a/src/feature/stats/bwhist.h +++ b/src/feature/stats/bwhist.h @@ -28,7 +28,7 @@ int bwhist_load_state(struct or_state_t *state, char **err); #ifdef BWHIST_PRIVATE typedef struct bw_array_t bw_array_t; -STATIC uint64_t find_largest_max(bw_array_t *b); +STATIC uint64_t find_largest_max(bw_array_t *b, int min_observation_time); STATIC void commit_max(bw_array_t *b); STATIC void advance_obs(bw_array_t *b); STATIC bw_array_t *bw_array_new(void); diff --git a/src/test/test_relay.c b/src/test/test_relay.c index b287f0d38b..8ed29b6282 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -98,7 +98,7 @@ test_relay_close_circuit(void *arg) tt_int_op(new_count, OP_EQ, old_count + 1); /* Ensure our write totals are 0 */ - tt_u64_op(find_largest_max(write_array), OP_EQ, 0); + tt_u64_op(find_largest_max(write_array, 86400), OP_EQ, 0); /* Mark the circuit for close */ circuit_mark_for_close(TO_CIRCUIT(orcirc), 0); @@ -107,7 +107,7 @@ test_relay_close_circuit(void *arg) advance_obs(write_array); commit_max(write_array); /* Check for two cells plus overhead */ - tt_u64_op(find_largest_max(write_array), OP_EQ, + tt_u64_op(find_largest_max(write_array, 86400), OP_EQ, 2*(get_cell_network_size(nchan->wide_circ_ids) +TLS_PER_CELL_OVERHEAD));

1 0

[tor/release-0.4.6] Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 265cca935aefd1a3bdbe6abc964858e10fb4a029 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 11 15:54:14 2021 -0400 Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks. Part of the ever-growing 40337 fix. --- changes/ticket40337 | 3 +++ src/feature/relay/router.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/ticket40337 b/changes/ticket40337 index 02ea29ffc1..1c86fc4c99 100644 --- a/changes/ticket40337 +++ b/changes/ticket40337 @@ -11,3 +11,6 @@ immediately from startup. Previously, they waited until they had been running for a full day. Closes ticket 40337. + - Relays on testing networks no longer rate-limit how frequently + they are willing to report new bandwidth measurements. Part of a fix + for ticket 40337. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 2696b8633b..c95f36aa8b 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2599,7 +2599,10 @@ check_descriptor_bandwidth_changed(time_t now) if ((prev != cur && (!prev || !cur)) || cur > (prev * BANDWIDTH_CHANGE_FACTOR) || cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) { - if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) { + const bool change_recent_enough = + last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now; + const bool testing_network = get_options()->TestingTorNetwork; + if (change_recent_enough || testing_network || !prev) { log_info(LD_GENERAL, "Measured bandwidth has changed; rebuilding descriptor."); mark_my_descriptor_dirty("bandwidth has changed");

1 0

[tor/release-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 0135fb028c8ca0ce310009f20efef89e53a36f2c Merge: 5717b88bcb 265cca935a Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 21 12:35:26 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5 changes/ticket40337 | 16 ++++++++++++++++ doc/man/tor.1.txt | 5 +++++ src/app/config/config.c | 2 ++ src/app/config/or_options_st.h | 4 ++++ src/app/config/testnet.inc | 1 + src/feature/relay/router.c | 5 ++++- src/feature/stats/bwhist.c | 19 ++++++++++++++----- src/feature/stats/bwhist.h | 2 +- src/test/test_relay.c | 4 ++-- 9 files changed, 49 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 5be41d420f6b68c4a5eb1206fefdb33bd616b66d Merge: da02708be1 bd1c14f015 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 21 12:35:36 2021 +0000 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40337 | 16 ++++++++++++++++ doc/man/tor.1.txt | 5 +++++ src/app/config/config.c | 2 ++ src/app/config/or_options_st.h | 4 ++++ src/app/config/testnet.inc | 1 + src/feature/relay/router.c | 5 ++++- src/feature/stats/bwhist.c | 19 ++++++++++++++----- src/feature/stats/bwhist.h | 2 +- src/test/test_relay.c | 4 ++-- 9 files changed, 49 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.6] Make MinTimeToReportBandwidth a testing-only option (and rename it)
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 9d7fca2306dc09097a24e225de59fb1ade7c9e34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 11 15:49:00 2021 -0400 Make MinTimeToReportBandwidth a testing-only option (and rename it) --- changes/ticket40337 | 5 +++-- doc/man/tor.1.txt | 12 +++++------- src/app/config/config.c | 10 ++-------- src/app/config/config.h | 7 ------- src/app/config/or_options_st.h | 2 +- src/app/config/testnet.inc | 2 +- src/feature/stats/bwhist.c | 2 +- 7 files changed, 13 insertions(+), 27 deletions(-) diff --git a/changes/ticket40337 b/changes/ticket40337 index f8f136a740..02ea29ffc1 100644 --- a/changes/ticket40337 +++ b/changes/ticket40337 @@ -1,5 +1,6 @@ - o Minor features (bandwidth reporting): - - Relays can now use the MinTimeToReportBandwidth option to change + o Minor features (testing): + - On a testing network, relays can now use the + TestingMinTimeToReportBandwidth option to change the smallest amount of time over which they're willing to report their observed maximum bandwidth. Previously, this was fixed at 1 day. For safety, values under 2 hours are only supported on diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index af4ee494ef..209900832f 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2448,13 +2448,6 @@ is non-zero): If we have more onionskins queued for processing than we can process in this amount of time, reject new ones. (Default: 1750 msec) -[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ **seconds**|**minutes**|**hours**:: - Do not report our measurements for our maximum observed bandwidth for any - time period that has lasted for less than this amount of time. - Setting this option too low can enable traffic analysis, and is - not permitted except on testing networks. Values over 1 day have - no effect. (Default: 1 day) - [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...:: Declare that this Tor relay is controlled or administered by a group or organization identical or similar to that of the other relays, defined by @@ -3602,6 +3595,11 @@ The following options are used for running a testing Tor network. Minimum value for the Fast flag. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set. (Default: 0.) +[[TestingMinTimeToReportBandwidth]] **TestingMinTimeToReportBandwidth** __N__ **seconds**|**minutes**|**hours**:: + Do not report our measurements for our maximum observed bandwidth for any + time period that has lasted for less than this amount of time. + Values over 1 day have no effect. (Default: 1 day) + [[TestingServerConsensusDownloadInitialDelay]] **TestingServerConsensusDownloadInitialDelay** __N__:: Initial delay in seconds for when servers should download consensuses. Changing this requires that **TestingTorNetwork** is set. (Default: 0) diff --git a/src/app/config/config.c b/src/app/config/config.c index 9011f36735..88da7a0aa7 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -563,7 +563,7 @@ static const config_var_t option_vars_[] = { V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), VPORT(MetricsPort), V(MetricsPortPolicy, LINELIST, NULL), - V(MinTimeToReportBandwidth, INTERVAL, "1 day"), + V(TestingMinTimeToReportBandwidth, INTERVAL, "1 day"), VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), @@ -3712,13 +3712,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; } - if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW && - !options->TestingTorNetwork) { - log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; " - "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW); - options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW; - } - if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); @@ -3994,6 +3987,7 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) CHECK_DEFAULT(TestingSigningKeySlop); CHECK_DEFAULT(TestingAuthKeySlop); CHECK_DEFAULT(TestingLinkKeySlop); + CHECK_DEFAULT(TestingMinTimeToReportBandwidth); or_options_free(dflt_options); } #undef CHECK_DEFAULT diff --git a/src/app/config/config.h b/src/app/config/config.h index 74e6942eb5..e95ef4a728 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -24,13 +24,6 @@ * expose more information than we're comfortable with. */ #define MIN_HEARTBEAT_PERIOD (30*60) -/** - * Lowest allowable value for MinTimeToReportBandwidth on a non-testing - * network; if this is too low we might report detail that is too - * fine-grained. - **/ -#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60) - /** Maximum default value for MaxMemInQueues, in bytes. */ #if SIZEOF_VOID_P >= 8 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30) diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index efecc85d66..440c987365 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -1084,7 +1084,7 @@ struct or_options_t { /** How far must we be into the current bandwidth-measurement period to * report bandwidth observations from this period? */ - int MinTimeToReportBandwidth; + int TestingMinTimeToReportBandwidth; /** * Configuration objects for individual modules. diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 527e0d00b1..039454a0d0 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -19,7 +19,7 @@ { "TestingV3AuthInitialDistDelay", "20 seconds" }, { "TestingAuthDirTimeToLearnReachability", "0 minutes" }, { "MinUptimeHidServDirectoryV2", "0 minutes" }, -{ "MinTimeToReportBandwidth", "0 seconds" }, +{ "TestingMinTimeToReportBandwidth", "0 seconds" }, { "TestingServerDownloadInitialDelay", "0" }, { "TestingClientDownloadInitialDelay", "0" }, { "TestingServerConsensusDownloadInitialDelay", "0" }, diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c index 55a8f7c747..06ad48e5c3 100644 --- a/src/feature/stats/bwhist.c +++ b/src/feature/stats/bwhist.c @@ -241,7 +241,7 @@ MOCK_IMPL(int, bwhist_bandwidth_assess,(void)) { uint64_t w,r; - int min_obs_time = get_options()->MinTimeToReportBandwidth; + int min_obs_time = get_options()->TestingMinTimeToReportBandwidth; r = find_largest_max(read_array, min_obs_time); w = find_largest_max(write_array, min_obs_time); if (r>w)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit bd1c14f0156c4d166ed1706544242e31d7ddceff Merge: 1e08efdb58 0135fb028c Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 21 12:35:36 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40337 | 16 ++++++++++++++++ doc/man/tor.1.txt | 5 +++++ src/app/config/config.c | 2 ++ src/app/config/or_options_st.h | 4 ++++ src/app/config/testnet.inc | 1 + src/feature/relay/router.c | 5 ++++- src/feature/stats/bwhist.c | 19 ++++++++++++++----- src/feature/stats/bwhist.h | 2 +- src/test/test_relay.c | 4 ++-- 9 files changed, 49 insertions(+), 9 deletions(-)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 21 Oct '21

21 Oct '21

commit 5e5cbea1958e25292f7e7c476d785c40ab4e304d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 21 12:18:02 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 75fb511951..697e0f9a3e 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -19,13 +19,13 @@ # Henrique Casellato, 2021 # erinm, 2021 # André Abou Chami Campana <campana.andre(a)gmail.com>, 2021 -# Emma Peel, 2021 # José Ricardo dos Santos Júnior <hricardo2007(a)yandex.com>, 2021 # blueboy, 2021 # Gus, 2021 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021 # C. E., 2021 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -33,7 +33,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-21 10:31+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1777,7 +1777,7 @@ msgstr "" #: https//support.torproject.org/glossary/relay/ #: (content/glossary/relay/contents+en.lrword.term) msgid "relay" -msgstr "retransmitir" +msgstr "retransmissor" #: https//support.torproject.org/glossary/relay/ #: (content/glossary/relay/contents+en.lrword.definition)

1 0

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

21 Oct '21

commit 4987f0f4112580a7c9e9552148fc8e88511c2e79 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 21 12:15:13 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/contents+es.po b/contents+es.po index 3462dccc45..eaa1fb543f 100644 --- a/contents+es.po +++ b/contents+es.po @@ -14,8 +14,8 @@ # Đorđe Marušić <djordje(a)hzontal.org>, 2021 # erinm, 2021 # Zuhualime Akoochimoya, 2021 -# Emma Peel, 2021 # de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-21 11:36+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2021\n" +"Last-Translator: Emma Peel, 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" @@ -8712,8 +8712,8 @@ msgid "" "This way attackers will have to solve Captchas before they are able to " "attack deeper into your infrastructure." msgstr "" -"De esta manera, los atacantes tendrán que resolver Captchas antes de ser " -"capaces de atacar más profundo dentro de tu infraestructura." +"De esta manera, los atacantes tendrán que resolver Captchas antes de poder " +"atacar más adentro de tu infraestructura." #: https//community.torproject.org/onion-services/advanced/dos/ #: (content/onion-services/advanced/dos/contents+en.lrpage.body) @@ -9755,7 +9755,7 @@ msgstr "" #: https//community.torproject.org/onion-services/advanced/https/ #: (content/onion-services/advanced/https/contents+en.lrpage.body) msgid "### What's next" -msgstr "### Qué es lo que sigue" +msgstr "### Qué se avecina" #: https//community.torproject.org/onion-services/advanced/https/ #: (content/onion-services/advanced/https/contents+en.lrpage.body) @@ -9818,8 +9818,8 @@ msgid "" "opportunities)" msgstr "" "* [El Navegador Tor y los Servicios Cebolla - Desafíos y Oportunidades " -"(2020)](https://blog.torproject.org/tor-brower-onion-services-challenges-" -"opportunities)" +"(2020, en inglés)](https://blog.torproject.org/tor-brower-onion-services-" +"challenges-opportunities)" #: https//community.torproject.org/onion-services/advanced/https/ #: (content/onion-services/advanced/https/contents+en.lrpage.body) @@ -11306,8 +11306,8 @@ msgid "" "approach taken by Gmail for this same problem." msgstr "" "Las actividades de extracción de datos y robots pueden ser " -"reducidas/desaceleradas por Captchas, el cual es el abordaje tomado por " -"Gmail para este mismo problema." +"reducidas/desaceleradas por Captchas, que es lo que hace Gmail para este " +"mismo problema." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -11931,8 +11931,8 @@ msgid "" "Learn how to report relays that either doesn't work properly or tampers with" " our users' connections" msgstr "" -"Aprende como reportar repetidores que o bien no funcionan apropiadamente, o " -"interfieren con las conexiones de nuestros usuarios." +"Aprende como reportar repetidores que, o bien no funcionan apropiadamente, o" +" interfieren con las conexiones de nuestros usuarios." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay/community-resources/bad-relays/contents+en.lrpage.body) @@ -12422,7 +12422,8 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ #: (content/relay/community-resources/tor-exit-guidelines/contents+en.lrpage.body) msgid "1. Ask if the ISP is okay with a Tor exit" -msgstr "1. Pregunta al ISP tiene problemas con las salidas de Tor" +msgstr "" +"1. Pregunta al proveedor de Internet tiene problemas con las salidas de Tor" #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ #: (content/relay/community-resources/tor-exit-guidelines/contents+en.lrpage.body) @@ -17350,7 +17351,7 @@ msgid "" "[ReducedExitPolicy](https://trac.torproject.org/projects/tor/wiki/doc/Reduce…" " wiki page." msgstr "" -"La polítitca de salida reducida puede verse en la página wiki " +"La política de salida reducida puede verse en la página wiki " "[PolíticadeSalidaReducida](https://trac.torproject.org/projects/tor/wiki/doc…." #: https//community.torproject.org/relay/setup/exit/ @@ -17956,8 +17957,8 @@ msgstr "" "estoy alojando los materiales supuestamente en infracción, y aún más, las " "salvaguardias de la Ley de Derechos de Autor del Milenio Digital (\"DMCA\") " "probablemente le protegen de la responsabilidad que surge de esta queja. La " -"misiva probablemente está basada en malentendidos acerca de la ley, y algo " -"del software que corro." +"misiva probablemente está basada en malentendidos acerca de la ley, y un " +"software que uso." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/ #: (content/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/contents+en.lrpage.body) @@ -20208,7 +20209,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay/setup/bridge/docker/contents+en.lrpage.body) msgid "`docker-compose pull obfs4-bridge`" -msgstr "" +msgstr "`docker-compose pull obfs4-bridge`" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay/setup/bridge/docker/contents+en.lrpage.body) @@ -20757,7 +20758,7 @@ msgid "" "To confirm your bridge is running with no issues, you should see something " "like this (`/var/log/tor/notices.log`):" msgstr "" -"Para confirmar que tu puente está corriendo sin problemas, debieras ver algo" +"Para confirmar que tu puente está corriendo sin problemas, deberías ver algo" " como esto (`/var/log/tor/notices.log`):" #: https//community.torproject.org/relay/setup/guard/netbsd/ @@ -21327,7 +21328,7 @@ msgstr "Cómo desplegar un repetidor Intermedio/Guardián en DragonflyBSD" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay/setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "# 1. Bootstrap `pkg`" -msgstr "### 1. Secuenciar para arranque a `pkg`" +msgstr "# 1. Arranca `pkg` por primera vez" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay/setup/guard/dragonflybsd/contents+en.lrpage.body) @@ -22158,12 +22159,12 @@ msgstr "Habilita y arranca actualizaciones automáticas vía:" #: https//community.torproject.org/relay/setup/guard/centosrhel/updates/ #: (content/relay/setup/guard/centosrhel/updates/contents+en.lrpage.body) msgid "systemctl enable --now dnf-automatic.timer" -msgstr "habilitar systemctl --ahora dnf-automatic.timer" +msgstr "systemctl enable --now dnf-automatic.timer" #: https//community.torproject.org/relay/setup/guard/centosrhel/updates/ #: (content/relay/setup/guard/centosrhel/updates/contents+en.lrpage.body) msgid "Check status of dnf-automatic:" -msgstr "Compruebe el estado del dnf-automatic:" +msgstr "Comprueba el estado del dnf-automatic:" #: https//community.torproject.org/relay/setup/guard/centosrhel/updates/ #: (content/relay/setup/guard/centosrhel/updates/contents+en.lrpage.body)

1 0