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

[tor/release-0.3.3] rust/protover: validate unknown protocol names use only allowed characters
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 7c26f88fd7bde6844f36f4810675688542c313bf Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Sep 13 16:33:58 2018 +0000 rust/protover: validate unknown protocol names use only allowed characters --- changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/changes/bug27687 b/changes/bug27687 new file mode 100644 index 000000000..8b7903b63 --- /dev/null +++ b/changes/bug27687 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - protover parsed and accepted unknown protocol names containing invalid + characters outside the range [A-Za-z0-9-]. Fixes bug 27687; bugfix on + 0.3.3.1-alpha. diff --git a/src/rust/protover/errors.rs b/src/rust/protover/errors.rs index 56473d12e..d9dc73381 100644 --- a/src/rust/protover/errors.rs +++ b/src/rust/protover/errors.rs @@ -18,6 +18,7 @@ pub enum ProtoverError { ExceedsExpansionLimit, UnknownProtocol, ExceedsNameLimit, + InvalidProtocol, } /// Descriptive error messages for `ProtoverError` variants. @@ -38,6 +39,8 @@ impl Display for ProtoverError { => write!(f, "A protocol in the protover string we attempted to parse is unknown."), ProtoverError::ExceedsNameLimit => write!(f, "An unrecognised protocol name was too long."), + ProtoverError::InvalidProtocol + => write!(f, "A protocol name includes invalid characters."), } } } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 12ede53e5..b3563b063 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -113,11 +113,17 @@ impl fmt::Display for UnknownProtocol { } } +fn is_valid_proto(s: &str) -> bool { + s.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') +} + impl FromStr for UnknownProtocol { type Err = ProtoverError; fn from_str(s: &str) -> Result<Self, Self::Err> { - if s.len() <= MAX_PROTOCOL_NAME_LENGTH { + if !is_valid_proto(s) { + Err(ProtoverError::InvalidProtocol) + } else if s.len() <= MAX_PROTOCOL_NAME_LENGTH { Ok(UnknownProtocol(s.to_string())) } else { Err(ProtoverError::ExceedsNameLimit) @@ -129,6 +135,9 @@ impl UnknownProtocol { /// Create an `UnknownProtocol`, ignoring whether or not it /// exceeds MAX_PROTOCOL_NAME_LENGTH. fn from_str_any_len(s: &str) -> Result<Self, ProtoverError> { + if !is_valid_proto(s) { + return Err(ProtoverError::InvalidProtocol); + } Ok(UnknownProtocol(s.to_string())) } } @@ -777,6 +786,29 @@ mod test { use super::*; + macro_rules! parse_proto { + ($e:expr) => {{ + let proto: Result<UnknownProtocol, _> = $e.parse(); + let proto2 = UnknownProtocol::from_str_any_len($e); + assert_eq!(proto, proto2); + proto + }}; + } + + #[test] + fn test_protocol_from_str() { + assert!(parse_proto!("Cons").is_ok()); + assert!(parse_proto!("123").is_ok()); + assert!(parse_proto!("1-2-3").is_ok()); + + let err = Err(ProtoverError::InvalidProtocol); + assert_eq!(err, parse_proto!("a_b_c")); + assert_eq!(err, parse_proto!("a b")); + assert_eq!(err, parse_proto!("a,")); + assert_eq!(err, parse_proto!("b.")); + assert_eq!(err, parse_proto!("é")); + } + macro_rules! assert_protoentry_is_parseable { ($e:expr) => ( let protoentry: Result<ProtoEntry, ProtoverError> = $e.parse();

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit a2823f106bde9c4667bc1ca8946e74c1cd81b5c6 Merge: 7597340b3 7c26f88fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:25:34 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] rust/protover: validate unknown protocol names use only allowed characters
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 7c26f88fd7bde6844f36f4810675688542c313bf Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Sep 13 16:33:58 2018 +0000 rust/protover: validate unknown protocol names use only allowed characters --- changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/changes/bug27687 b/changes/bug27687 new file mode 100644 index 000000000..8b7903b63 --- /dev/null +++ b/changes/bug27687 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - protover parsed and accepted unknown protocol names containing invalid + characters outside the range [A-Za-z0-9-]. Fixes bug 27687; bugfix on + 0.3.3.1-alpha. diff --git a/src/rust/protover/errors.rs b/src/rust/protover/errors.rs index 56473d12e..d9dc73381 100644 --- a/src/rust/protover/errors.rs +++ b/src/rust/protover/errors.rs @@ -18,6 +18,7 @@ pub enum ProtoverError { ExceedsExpansionLimit, UnknownProtocol, ExceedsNameLimit, + InvalidProtocol, } /// Descriptive error messages for `ProtoverError` variants. @@ -38,6 +39,8 @@ impl Display for ProtoverError { => write!(f, "A protocol in the protover string we attempted to parse is unknown."), ProtoverError::ExceedsNameLimit => write!(f, "An unrecognised protocol name was too long."), + ProtoverError::InvalidProtocol + => write!(f, "A protocol name includes invalid characters."), } } } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 12ede53e5..b3563b063 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -113,11 +113,17 @@ impl fmt::Display for UnknownProtocol { } } +fn is_valid_proto(s: &str) -> bool { + s.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') +} + impl FromStr for UnknownProtocol { type Err = ProtoverError; fn from_str(s: &str) -> Result<Self, Self::Err> { - if s.len() <= MAX_PROTOCOL_NAME_LENGTH { + if !is_valid_proto(s) { + Err(ProtoverError::InvalidProtocol) + } else if s.len() <= MAX_PROTOCOL_NAME_LENGTH { Ok(UnknownProtocol(s.to_string())) } else { Err(ProtoverError::ExceedsNameLimit) @@ -129,6 +135,9 @@ impl UnknownProtocol { /// Create an `UnknownProtocol`, ignoring whether or not it /// exceeds MAX_PROTOCOL_NAME_LENGTH. fn from_str_any_len(s: &str) -> Result<Self, ProtoverError> { + if !is_valid_proto(s) { + return Err(ProtoverError::InvalidProtocol); + } Ok(UnknownProtocol(s.to_string())) } } @@ -777,6 +786,29 @@ mod test { use super::*; + macro_rules! parse_proto { + ($e:expr) => {{ + let proto: Result<UnknownProtocol, _> = $e.parse(); + let proto2 = UnknownProtocol::from_str_any_len($e); + assert_eq!(proto, proto2); + proto + }}; + } + + #[test] + fn test_protocol_from_str() { + assert!(parse_proto!("Cons").is_ok()); + assert!(parse_proto!("123").is_ok()); + assert!(parse_proto!("1-2-3").is_ok()); + + let err = Err(ProtoverError::InvalidProtocol); + assert_eq!(err, parse_proto!("a_b_c")); + assert_eq!(err, parse_proto!("a b")); + assert_eq!(err, parse_proto!("a,")); + assert_eq!(err, parse_proto!("b.")); + assert_eq!(err, parse_proto!("é")); + } + macro_rules! assert_protoentry_is_parseable { ($e:expr) => ( let protoentry: Result<ProtoEntry, ProtoverError> = $e.parse();

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 82b128277203b86f35739a424787bbb268a6cdeb Merge: 3ddfd5ff2 7c26f88fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:25:34 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit bd4c50f36b366f61f18769c17e17d77d75891465 Merge: 5e94c9384 82b128277 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:25:34 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-)

1 0

[tor/master] Ticket #27678: Emit CIRC_BW events immediately for dropped cells.
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit efa20756701b3434fce29b41f7210bc33423d764 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 13 01:23:17 2018 +0000 Ticket #27678: Emit CIRC_BW events immediately for dropped cells. We determine that a cell was dropped by inspecting CIRC_BW fields. If we did not update the delivered or overhead fields after processing the cell, the cell was dropped/not processed. Also emit CIRC_BW events for cases where we decide to close the circuit in this function, so vanguards can print messages about dropped cells in those cases, too. --- src/core/or/command.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/core/or/command.c b/src/core/or/command.c index 461e49b62..ebddc4a35 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -480,6 +480,8 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) const or_options_t *options = get_options(); circuit_t *circ; int reason, direction; + uint32_t orig_delivered_bw = 0; + uint32_t orig_overhead_bw = 0; circ = circuit_get_by_circid_channel(cell->circ_id, chan); @@ -512,6 +514,15 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) /* Count the payload bytes only. We don't care about cell headers */ ocirc->n_read_circ_bw = tor_add_u32_nowrap(ocirc->n_read_circ_bw, CELL_PAYLOAD_SIZE); + + /* Stash the original delivered and overhead values. These values are + * updated by circuit_read_valid_data() during cell processing by + * connection_edge_process_relay_cell(), called from + * circuit_receive_relay_cell() below. If they do not change, we inform + * the control port about dropped cells immediately after the call + * to circuit_receive_relay_cell() below. */ + orig_delivered_bw = ocirc->n_delivered_read_circ_bw; + orig_overhead_bw = ocirc->n_overhead_read_circ_bw; } if (!CIRCUIT_IS_ORIGIN(circ) && @@ -535,6 +546,8 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) (unsigned)cell->circ_id); if (CIRCUIT_IS_ORIGIN(circ)) { circuit_log_path(LOG_WARN, LD_OR, TO_ORIGIN_CIRCUIT(circ)); + /* Always emit a bandwidth event for closed circs */ + control_event_circ_bandwidth_used_for_circ(TO_ORIGIN_CIRCUIT(circ)); } else if (circ->n_chan) { log_warn(LD_OR, " upstream=%s", channel_get_actual_remote_descr(circ->n_chan)); @@ -560,9 +573,33 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,"circuit_receive_relay_cell " "(%s) failed. Closing.", direction==CELL_DIRECTION_OUT?"forward":"backward"); + /* Always emit a bandwidth event for closed circs */ + if (CIRCUIT_IS_ORIGIN(circ)) { + control_event_circ_bandwidth_used_for_circ(TO_ORIGIN_CIRCUIT(circ)); + } circuit_mark_for_close(circ, -reason); } + if (CIRCUIT_IS_ORIGIN(circ)) { + origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); + + /* If neither the delivered nor overhead values changed, this cell + * was dropped due to being invalid by one of the error codepaths in + * connection_edge_process_relay_cell(), called by + * circuit_receive_relay_cell(). + * + * Valid cells, on the other hand, call circuit_read_valid_data() + * to update these values upon processing them. + * + * So, if the values are the same as those stored above, + * emit a control port event for CIRC_BW, so the controller can + * react quickly to invalid cells. */ + if (orig_delivered_bw == ocirc->n_delivered_read_circ_bw && + orig_overhead_bw == ocirc->n_overhead_read_circ_bw) { + control_event_circ_bandwidth_used_for_circ(ocirc); + } + } + /* If this is a cell in an RP circuit, count it as part of the hidden service stats */ if (options->HiddenServiceStatistics &&

1 0

[tor/master] Ticket #27678: Changes file.
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit e86593c40df1956741fd3a53b68e36abfa205532 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 13 01:25:57 2018 +0000 Ticket #27678: Changes file. --- changes/ticket27678 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket27678 b/changes/ticket27678 new file mode 100644 index 000000000..daeb262e1 --- /dev/null +++ b/changes/ticket27678 @@ -0,0 +1,5 @@ + o Minor features (controller): + - Emit CIRC_BW events as soon as we detect that we processed an invalid + or otherwise dropped cell on a circuit. This allows vanguards and + other controllers to react more quickly to dropped cells. Closes + ticket 27678.

1 0

[tor/master] Control port call to emit a CIRC_BW event for a single circuit.
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 80ffedd3ca78e76e706ef2ac3f469a4fa4aa7a96 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 13 01:22:02 2018 +0000 Control port call to emit a CIRC_BW event for a single circuit. This commit only moves code. No functionality has been changed. --- src/feature/control/control.c | 74 +++++++++++++++++++++++++++++-------------- src/feature/control/control.h | 2 +- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 2fac3bd6d..d56fbcf8e 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -6049,41 +6049,69 @@ control_event_stream_bandwidth_used(void) int control_event_circ_bandwidth_used(void) { - origin_circuit_t *ocirc; - struct timeval now; - char tbuf[ISO_TIME_USEC_LEN+1]; if (!EVENT_IS_INTERESTING(EVENT_CIRC_BANDWIDTH_USED)) return 0; SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) { if (!CIRCUIT_IS_ORIGIN(circ)) continue; - ocirc = TO_ORIGIN_CIRCUIT(circ); - if (!ocirc->n_read_circ_bw && !ocirc->n_written_circ_bw) - continue; - tor_gettimeofday(&now); - format_iso_time_nospace_usec(tbuf, &now); - send_control_event(EVENT_CIRC_BANDWIDTH_USED, - "650 CIRC_BW ID=%d READ=%lu WRITTEN=%lu TIME=%s " - "DELIVERED_READ=%lu OVERHEAD_READ=%lu " - "DELIVERED_WRITTEN=%lu OVERHEAD_WRITTEN=%lu\r\n", - ocirc->global_identifier, - (unsigned long)ocirc->n_read_circ_bw, - (unsigned long)ocirc->n_written_circ_bw, - tbuf, - (unsigned long)ocirc->n_delivered_read_circ_bw, - (unsigned long)ocirc->n_overhead_read_circ_bw, - (unsigned long)ocirc->n_delivered_written_circ_bw, - (unsigned long)ocirc->n_overhead_written_circ_bw); - ocirc->n_written_circ_bw = ocirc->n_read_circ_bw = 0; - ocirc->n_overhead_written_circ_bw = ocirc->n_overhead_read_circ_bw = 0; - ocirc->n_delivered_written_circ_bw = ocirc->n_delivered_read_circ_bw = 0; + + control_event_circ_bandwidth_used_for_circ(TO_ORIGIN_CIRCUIT(circ)); } SMARTLIST_FOREACH_END(circ); return 0; } +/** + * Emit a CIRC_BW event line for a specific circuit. + * + * This function sets the values it emits to 0, and does not emit + * an event if there is no new data to report since the last call. + * + * Therefore, it may be called at any frequency. + */ +int +control_event_circ_bandwidth_used_for_circ(origin_circuit_t *ocirc) +{ + struct timeval now; + char tbuf[ISO_TIME_USEC_LEN+1]; + + tor_assert(ocirc); + + if (!EVENT_IS_INTERESTING(EVENT_CIRC_BANDWIDTH_USED)) + return 0; + + /* n_read_circ_bw and n_written_circ_bw are always updated + * when there is any new cell on a circuit, and set to 0 after + * the event, below. + * + * Therefore, checking them is sufficient to determine if there + * is new data to report. */ + if (!ocirc->n_read_circ_bw && !ocirc->n_written_circ_bw) + return 0; + + tor_gettimeofday(&now); + format_iso_time_nospace_usec(tbuf, &now); + send_control_event(EVENT_CIRC_BANDWIDTH_USED, + "650 CIRC_BW ID=%d READ=%lu WRITTEN=%lu TIME=%s " + "DELIVERED_READ=%lu OVERHEAD_READ=%lu " + "DELIVERED_WRITTEN=%lu OVERHEAD_WRITTEN=%lu\r\n", + ocirc->global_identifier, + (unsigned long)ocirc->n_read_circ_bw, + (unsigned long)ocirc->n_written_circ_bw, + tbuf, + (unsigned long)ocirc->n_delivered_read_circ_bw, + (unsigned long)ocirc->n_overhead_read_circ_bw, + (unsigned long)ocirc->n_delivered_written_circ_bw, + (unsigned long)ocirc->n_overhead_written_circ_bw); + ocirc->n_written_circ_bw = ocirc->n_read_circ_bw = 0; + ocirc->n_overhead_written_circ_bw = ocirc->n_overhead_read_circ_bw = 0; + ocirc->n_delivered_written_circ_bw = ocirc->n_delivered_read_circ_bw = 0; + + return 0; +} + /** Print out CONN_BW event for a single OR/DIR/EXIT <b>conn</b> and reset * bandwidth counters. */ int diff --git a/src/feature/control/control.h b/src/feature/control/control.h index 3445eb0a9..cd5402d45 100644 --- a/src/feature/control/control.h +++ b/src/feature/control/control.h @@ -146,6 +146,7 @@ int control_event_bandwidth_used(uint32_t n_read, uint32_t n_written); int control_event_stream_bandwidth(edge_connection_t *edge_conn); int control_event_stream_bandwidth_used(void); int control_event_circ_bandwidth_used(void); +int control_event_circ_bandwidth_used_for_circ(origin_circuit_t *ocirc); int control_event_conn_bandwidth(connection_t *conn); int control_event_conn_bandwidth_used(void); int control_event_circuit_cell_stats(void); @@ -246,7 +247,6 @@ void control_event_hs_descriptor_content(const char *onion_address, const char *desc_id, const char *hsdir_fp, const char *content); - void control_free_all(void); #ifdef CONTROL_PRIVATE

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/329'
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit bb012d7941d3e4fd4ad31e3d64e9a820f25c34a2 Merge: b67f3b751 e86593c40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:22:23 2018 -0400 Merge remote-tracking branch 'tor-github/pr/329' changes/ticket27678 | 5 +++ src/core/or/command.c | 37 ++++++++++++++++++++++ src/feature/control/control.c | 74 +++++++++++++++++++++++++++++-------------- src/feature/control/control.h | 2 +- 4 files changed, 94 insertions(+), 24 deletions(-)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 74755a909eb2f86173a8b7e77dbfac316d31009f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 13:18:57 2018 +0000 Update translations for support-portal_completed --- contents+ga.po | 210 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 120 insertions(+), 90 deletions(-) diff --git a/contents+ga.po b/contents+ga.po index 619efd59a..b272cd177 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-07 17:41+CET\n" +"POT-Creation-Date: 2018-09-13 22:35+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n" @@ -294,11 +294,6 @@ msgstr "" msgid "setting-tor-browser-as-default" msgstr "setting-tor-browser-as-default" -#: http//localhost/tbb/tbb-37/ -#: (content/tbb/tbb-37/contents+en.lrquestion.description) -msgid "We currently offer Tor Browser in the following languages:" -msgstr "Tá Brabhsálaí Tor ar fáil sna teangacha seo a leanas faoi láthair:" - #: http//localhost/tbb/tbb-15/ #: (content/tbb/tbb-15/contents+en.lrquestion.description) msgid "" @@ -555,6 +550,15 @@ msgstr "" "Is féidir leat luas an líonra a fheabhsú trí athsheachadán de do chuid féin " "a rith, nó daoine eile a spreagadh chun é seo a dhéanamh." +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"<img class=\"card-img-top\" src=\"/static/images/onion-website.png\" " +"alt=\"Onion icon\">" +msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/onion-website.png\" " +"alt=\"Oinniún beag\">" + #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "" @@ -571,14 +575,14 @@ msgstr "" "Is féidir leat Brabhsálaí Tor a nuashonrú chomh luath agus go bhfuil leagan " "nua ar fáil." -#: http//localhost/onionservices/onionservices-2/ -#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "" -"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " -"with a padlock\">" +"<img class=\"card-img-top\" src=\"/static/images/new-circuit-display.png\" " +"alt=\"New Circuit for this Site\">" msgstr "" -"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Oinniún glas " -"le glas fraincín\">" +"<img class=\"card-img-top\" src=\"/static/images/new-circuit-display.png\" " +"alt=\"Ciorcad Nua don Suíomh seo\">" #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -587,8 +591,12 @@ msgid "" " *BSD." msgstr "Ní thacaíonn, go hoifigiúil." +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<div class=\"col-md-6\">" msgstr "<div class=\"col-md-6\">" @@ -719,6 +727,11 @@ msgstr "" "Is dócha go bhfeicfidh tú ceann de na hearráidí coitianta seo (cuardaigh na " "línte seo a leanas sa logchomhad Tor):" +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "<h4 class=\"card-title\">New Circuit for this Site</h4>" +msgstr "<h4 class=\"card-title\">Ciorcad Nua don Suíomh seo</h4>" + #: http//localhost/tbb/tbb-3/ #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug) msgid "tell-which-website-are-visited-while-using-tor-browser" @@ -741,18 +754,6 @@ msgstr "" "easy.html.en\">Brabhsálaí Tor</a></mark> a íoslódáil agus a úsáid le dul go " "dtí an suíomh coiscthe." -#: http//localhost/operators/operators-3/ -#: (content/operators/operators-3/contents+en.lrquestion.description) -msgid "" -"For the most in-depth resource on running a relay, see the <mark><a " -"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Tor " -"Relay Guide</a>." -msgstr "" -"Más mian leat athsheachadán de do chuid féin a rith, gheobhaidh tú na " -"mionsonraí go léir sa <mark><a " -"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Lámhleabhar" -" Athsheachadán Tor</a>." - #: http//localhost/misc/misc-2/ #: (content/misc/misc-2/contents+en.lrquestion.description) msgid "" @@ -984,8 +985,8 @@ msgid "" "malware." msgstr "" "Creidimid go bhfuil sé contúirteach Flash a úsáid i mbrabhsálaí ar bith — is" -" bogearraí an-neamhshlán é a chuireann do phríobháideachas agus do ríomhaire" -" i gcontúirt." +" bogearra an-neamhshlán é a chuireann do phríobháideachas agus do ríomhaire " +"i gcontúirt." #: http//localhost/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) @@ -1058,11 +1059,6 @@ msgstr "" msgid "* tor.real" msgstr "* tor.real" -#: http//localhost/operators/operators-6/ -#: (content/operators/operators-6/contents+en.lrquestion.description) -msgid "bandwidth caps)" -msgstr "teorainn ar bhandaleithead)" - #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) #: http//localhost/censorship/censorship-5/ @@ -1386,14 +1382,11 @@ msgstr "" msgid "I'm having a problem with NoScript." msgstr "Tá fadhb agam le NoScript." -#: http//localhost/tbb/tbb-39/ -#: (content/tbb/tbb-39/contents+en.lrquestion.description) -msgid "" -"Sometimes Javascript-heavy websites can have functional issues over Tor " -"Browser." +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.title) +msgid "Why does Tor Browser ship with Javascript enabled?" msgstr "" -"Uaireanta bíonn fadhbanna le Brabhsálaí Tor ar shuímh Ghréasáin a bhaineann " -"úsáid as mórán JavaScript." +"Cén fáth a bhfuil JavaScript cumasaithe i mbrabhsálaí Tor mar réamhshocrú?" #: http//localhost/misc/misc-3/ #: (content/misc/misc-3/contents+en.lrquestion.seo_slug) @@ -1405,6 +1398,15 @@ msgstr "tor-funding" msgid "Tor browser will install the updates." msgstr "Suiteálfaidh Brabhsálaí Tor na nuashonruithe." +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"<h4 class=\"card-title\">Green onion with a padlock to identify .onion " +"website with https</h4>" +msgstr "" +"<h4 class=\"card-title\">Oinniún beag glas le glas fraincín a léiríonn " +"suíomh .onion a úsáideann https</h4>" + #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "" @@ -1676,15 +1678,6 @@ msgstr "" msgid "first-address-relay-circuit" msgstr "first-address-relay-circuit" -#: http//localhost/tbb/tbb-29/ -#: (content/tbb/tbb-29/contents+en.lrquestion.description) -msgid "" -"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " -"Circuit for this Site\">" -msgstr "" -"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"Ciorcad" -" Nua don Suíomh seo\">" - #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) msgid "" @@ -2086,6 +2079,15 @@ msgstr "" "Féach an <mark><a href=\"https://duck.co/help\">suíomh tacaíochta " "DuckDuckGo</a></mark>." +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"<h4 class=\"card-title\">Icon of a green onion to identify .onion " +"website</h4>" +msgstr "<h4 class=\"card-title\">Oinniún glas a léiríonn suíomh .onion</h4>" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" @@ -2711,6 +2713,8 @@ msgstr "" #: (content/operators/operators-1/contents+en.lrquestion.description) #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) msgid "" "For the most in-depth resource on running a relay, see the <mark><a " "href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Tor " @@ -2795,10 +2799,16 @@ msgstr "does-tor-keep-logs" msgid "Thank you.\"" msgstr "Go raibh maith agat.\"" -#: http//localhost/tbb/tbb-37/ -#: (content/tbb/tbb-37/contents+en.lrquestion.description) -msgid "* 日本語 (ja)" -msgstr "* Seapáinis (ja)" +#: http//localhost/gettor/gettor-2/ +#: (content/gettor/gettor-2/contents+en.lrquestion.description) +msgid "" +"You may be offered a choice of \"32-bit\" or \"64-bit\" software: this " +"depends on the model of the computer you are using; consult documentation " +"about your computer to find out more." +msgstr "" +"Má tá rogha agat idir bogearra \"32-giotán\" nó \"64-giotán\", braitheann an" +" freagra ar an sórt ríomhaire atá agat; féach ar an doiciméadú maidir le do " +"ríomhaire chun tuilleadh eolais a fháil." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -3059,8 +3069,12 @@ msgstr "" " tú rud éigin sa mbrabhsálaí eile a raibh tú ag iarraidh é a dhéanamh in " "Tor." +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<div class=\"card-body\">" msgstr "<div class=\"card-body\">" @@ -3239,8 +3253,12 @@ msgstr "" "an íoslódáil a dheimhniú</a></mark>), méarlorg na heochrach a úsáideadh chun" " an síniú a dhéanamh, agus suim sheiceála an phacáiste." +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<div class=\"card\">" msgstr "<div class=\"card\">" @@ -3273,8 +3291,12 @@ msgstr "" "Úsáidfidh cluaisíní agus fuinneoga oscailte eile ón suíomh céanna an ciorcad" " nua freisin, chomh luath is a athlódálfar iad." +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "</div>" msgstr "</div>" @@ -3377,6 +3399,17 @@ msgstr "" "href=\"https://www.torproject.org/projects/torbrowser/design/\">Tuilleadh " "eolais maidir le dearadh Bhrabhsálaí Tor</a></mark>." +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "" +"We currently offer <mark><a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " +"Browser</a></mark> in the following languages:" +msgstr "" +"Tá <mark><a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Brabhsálaí " +"Tor</a></mark> ar fáil sna teangacha seo a leanas:" + #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) msgid "Tor Messenger" @@ -3418,6 +3451,11 @@ msgstr "Ceisteanna Is Coitianta" msgid "How do I uninstall Tor Browser?" msgstr "Conas is féidir liom Brabhsálaí Tor a dhíshuiteáil?" +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "<h4 class=\"card-title\">New Identity</h4>" +msgstr "<h4 class=\"card-title\">Aitheantas Nua</h4>" + #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.title) msgid "" @@ -3508,16 +3546,10 @@ msgstr "" "2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " "xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -#: http//localhost/gettor/gettor-2/ -#: (content/gettor/gettor-2/contents+en.lrquestion.description) -msgid "" -"You may be offered a choice of \"32-bit\" or \"64-bit\" software: this " -"depends on the model of the computer you are using; consult documentation " -"about your computer to find out more." -msgstr "" -"Má tá rogha agat idir bogearra \"32-giotán\" nó \"64-giotán\", braitheann an" -" freagra ar an sórt ríomhaire atá agat; féach ar an doiciméadú maidir le do " -"ríomhaire chun tuilleadh eolais a fháil." +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* 日本語 (ja)" +msgstr "* Seapáinis (ja)" #: http//localhost/tbb/tbb-2/ #: (content/tbb/tbb-2/contents+en.lrquestion.description) @@ -3625,15 +3657,6 @@ msgstr "" "t-athsheachadán amach criptithe sa chaoi nach mbeadh cúléisteoir in ann é a " "léamh." -#: http//localhost/tbb/tbb-29/ -#: (content/tbb/tbb-29/contents+en.lrquestion.description) -msgid "" -"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " -"Browser Menu\">" -msgstr "" -"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Roghchlár" -" Bhrabhsálaí Tor\">" - #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.description) msgid "" @@ -3735,11 +3758,14 @@ msgstr "" "(ISP), in ann a fheiceáil go bhfuil tú ag baint úsáide as Tor, ach ní bheidh" " siad in ann na suímh a dtugann tú cuairt orthu a fheiceáil." -#: http//localhost/tbb/tbb-34/ -#: (content/tbb/tbb-34/contents+en.lrquestion.title) -msgid "Why does Tor Browser ship with Javascript enabled?" +#: http//localhost/tbb/tbb-39/ +#: (content/tbb/tbb-39/contents+en.lrquestion.description) +msgid "" +"Sometimes Javascript-heavy websites can have functional issues over Tor " +"Browser." msgstr "" -"Cén fáth a bhfuil JavaScript cumasaithe i mbrabhsálaí Tor mar réamhshocrú?" +"Uaireanta bíonn fadhbanna le Brabhsálaí Tor ar shuímh Ghréasáin a bhaineann " +"úsáid as mórán JavaScript." #: http//localhost/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) @@ -3820,13 +3846,6 @@ msgstr "" "rochtain trí cheangal a bhunú le <a " "href=\"http://3g2upl4pq6kufc4m.onion\">Seirbhís Onion DuckDuckGo</a>" -#: http//localhost/operators/operators-6/ -#: (content/operators/operators-6/contents+en.lrquestion.description) -msgid "## Set your bandwidth rate (leave commented and Tor will run without" -msgstr "" -"## Socraigh an ráta bandaleithid (fág mar nóta tráchta é agus rithfidh Tor " -"gan" - #: http//localhost/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "" @@ -3898,6 +3917,15 @@ msgstr "" msgid "#MyFamily $keyid,$keyid,..." msgstr "#MyFamily $keyid,$keyid,..." +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"<img class=\"card-img-top\" src=\"/static/images/menu-new-identity.png\" " +"alt=\"Tor Browser Menu\">" +msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/menu-new-identity.png\" " +"alt=\"Roghchlár Bhrabhsálaí Tor\">" + #: http//localhost/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.seo_slug) msgid "website-is-blocking-access-over-tor" @@ -4206,6 +4234,15 @@ msgstr "" "href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Lámhleabhar " "Bhrabhsálaí Tor</a></mark>." +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"<img class=\"card-img-top\" src=\"/static/images/padlock-onion.png\" " +"alt=\"Green onion with a padlock\">" +msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/padlock-onion.png\" " +"alt=\"Oinniún glas le glas fraincín\">" + #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) msgid "* 简体字 (zh-CN)" @@ -4294,11 +4331,6 @@ msgstr "" "Caithfidh mé úsáideoir Tor a lorg mar gheall ar chúis an-láidir. An " "gcabhródh sibh liom?" -#: http//localhost/onionservices/onionservices-2/ -#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) -msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" -msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Oinniún beag\">" - #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) #: http//localhost/censorship/censorship-5/ @@ -4449,6 +4481,8 @@ msgstr "pick-which-country-i-am-exiting" #: (content/operators/operators-2/contents+en.lrquestion.description) #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) msgid "" "## Set your bandwidth rate (leave commented and Tor will run without " "bandwidth caps)" @@ -4626,10 +4660,6 @@ msgstr "Íoslódáil Brabhsálaí Tor" msgid "Search" msgstr "Cuardaigh" -#: templates/sidenav.html:4 templates/sidenav.html:30 -msgid "Topics" -msgstr "Topaicí" - #: templates/macros/question.html:11 msgid "Permalink" msgstr "Buan-nasc"

1 0