June 2020 - tor-commits - lists.torproject.org

[tor/master] Rename router_should_skip_orport_reachability_check.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit f9de0affd3f50d411e04bc1229525af2a14927fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 14:39:01 2020 -0400 Rename router_should_skip_orport_reachability_check. This was supposed to happen in #40012, but the command line was wrong. This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ router_should_skip_orport_reachability_check router_all_orports_seem_reachable --- src/core/or/circuitbuild.c | 2 +- src/core/or/circuituse.c | 4 ++-- src/feature/control/control_getinfo.c | 4 ++-- src/feature/relay/router.c | 2 +- src/feature/relay/selftest.c | 2 +- src/feature/relay/selftest.h | 4 ++-- src/feature/stats/predict_ports.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index be8ec6f3c..652d85b1c 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1055,7 +1055,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); clear_broken_connection_map(1); if (server_mode(options) && - !router_should_skip_orport_reachability_check(options)) { + !router_all_orports_seem_reachable(options)) { inform_testing_reachability(); router_do_reachability_checks(1, 1); } diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 735881753..f4cd4ced4 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -1642,7 +1642,7 @@ static void circuit_testing_opened(origin_circuit_t *circ) { if (have_performed_bandwidth_test || - !router_should_skip_orport_reachability_check(get_options())) { + !router_all_orports_seem_reachable(get_options())) { /* either we've already done everything we want with testing circuits, * or this testing circuit became open due to a fluke, e.g. we picked * a last hop where we already had the connection open due to an @@ -1661,7 +1661,7 @@ circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) { const or_options_t *options = get_options(); if (server_mode(options) && - router_should_skip_orport_reachability_check(options)) + router_all_orports_seem_reachable(options)) return; log_info(LD_GENERAL, diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index 8d6c314b4..47e0224a9 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -1279,7 +1279,7 @@ getinfo_helper_events(control_connection_t *control_conn, ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded/or")) { *answer = tor_strdup( - router_should_skip_orport_reachability_check(options) ? + router_all_orports_seem_reachable(options) ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded/dir")) { *answer = tor_strdup( @@ -1288,7 +1288,7 @@ getinfo_helper_events(control_connection_t *control_conn, } else if (!strcmp(question, "status/reachability-succeeded")) { tor_asprintf( answer, "OR=%d DIR=%d", - router_should_skip_orport_reachability_check(options) ? 1 : 0, + router_all_orports_seem_reachable(options) ? 1 : 0, router_dirport_seems_reachable(options) ? 1 : 0); } else if (!strcmp(question, "status/bootstrap-phase")) { *answer = control_event_boot_last_msg(); diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 1691ac5f4..1933f61ed 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1363,7 +1363,7 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!router_should_skip_orport_reachability_check(options)) + if (!router_all_orports_seem_reachable(options)) return 0; if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { /* All set: there are no exits in the consensus (maybe this is a tiny diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 71054e6e8..64b8578ba 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -408,7 +408,7 @@ ready_to_publish(const or_options_t *options) { return options->PublishServerDescriptor_ != NO_DIRINFO && router_dirport_seems_reachable(options) && - router_should_skip_orport_reachability_check(options); + router_all_orports_seem_reachable(options); } /** Annotate that we found our ORPort reachable with a given address diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h index 9b7005db3..911d8bdc3 100644 --- a/src/feature/relay/selftest.h +++ b/src/feature/relay/selftest.h @@ -15,7 +15,7 @@ #ifdef HAVE_MODULE_RELAY struct or_options_t; -#define router_should_skip_orport_reachability_check(opts) \ +#define router_all_orports_seem_reachable(opts) \ router_orport_seems_reachable((opts),0) int router_orport_seems_reachable( const struct or_options_t *options, @@ -34,7 +34,7 @@ void router_reset_reachability(void); #else /* !defined(HAVE_MODULE_RELAY) */ -#define router_should_skip_orport_reachability_check(opts) \ +#define router_all_orports_seem_reachable(opts) \ ((void)(opts), 0) #define router_orport_seems_reachable(opts, fam) \ ((void)(opts), (void)(fam), 0) diff --git a/src/feature/stats/predict_ports.c b/src/feature/stats/predict_ports.c index 37f7f4c58..57463952e 100644 --- a/src/feature/stats/predict_ports.c +++ b/src/feature/stats/predict_ports.c @@ -270,7 +270,7 @@ rep_hist_circbuilding_dormant(time_t now) /* see if we'll still need to build testing circuits */ if (server_mode(options) && - (!router_should_skip_orport_reachability_check(options) || + (!router_all_orports_seem_reachable(options) || !circuit_enough_testing_circs())) return 0; if (!router_dirport_seems_reachable(options))

1 0

[tor/master] Make a bunch of networkstatus_t parameters constant.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 93ccb3294bd2af4587d11e7306422a9aef83013c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 14:28:43 2020 -0400 Make a bunch of networkstatus_t parameters constant. This is part of refactoring our "notify the rest of the code that we have a new consensus" code. --- src/core/or/channelpadding.c | 2 +- src/core/or/channelpadding.h | 3 +-- src/core/or/circuitstats.c | 4 ++-- src/core/or/circuitstats.h | 2 +- src/feature/nodelist/nodelist.c | 4 ++-- src/feature/nodelist/nodelist.h | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/core/or/channelpadding.c b/src/core/or/channelpadding.c index be2ce78a1..c754a58c4 100644 --- a/src/core/or/channelpadding.c +++ b/src/core/or/channelpadding.c @@ -90,7 +90,7 @@ static int consensus_nf_pad_single_onion; * for every single connection, every second. */ void -channelpadding_new_consensus_params(networkstatus_t *ns) +channelpadding_new_consensus_params(const networkstatus_t *ns) { #define DFLT_NETFLOW_INACTIVE_KEEPALIVE_LOW 1500 #define DFLT_NETFLOW_INACTIVE_KEEPALIVE_HIGH 9500 diff --git a/src/core/or/channelpadding.h b/src/core/or/channelpadding.h index d1c7192ff..9246988cd 100644 --- a/src/core/or/channelpadding.h +++ b/src/core/or/channelpadding.h @@ -37,7 +37,6 @@ int channelpadding_send_enable_command(channel_t *chan, uint16_t low_timeout, int channelpadding_get_circuits_available_timeout(void); unsigned int channelpadding_get_channel_idle_timeout(const channel_t *, int); -void channelpadding_new_consensus_params(networkstatus_t *ns); +void channelpadding_new_consensus_params(const networkstatus_t *ns); #endif /* !defined(TOR_CHANNELPADDING_H) */ - diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c index 6a9d84df9..bc6c26379 100644 --- a/src/core/or/circuitstats.c +++ b/src/core/or/circuitstats.c @@ -399,7 +399,7 @@ circuit_build_times_initial_timeout(void) * and learn a new timeout. */ static int32_t -circuit_build_times_recent_circuit_count(networkstatus_t *ns) +circuit_build_times_recent_circuit_count(const networkstatus_t *ns) { int32_t num; num = networkstatus_get_param(ns, "cbtrecentcount", @@ -425,7 +425,7 @@ circuit_build_times_recent_circuit_count(networkstatus_t *ns) */ void circuit_build_times_new_consensus_params(circuit_build_times_t *cbt, - networkstatus_t *ns) + const networkstatus_t *ns) { int32_t num; diff --git a/src/core/or/circuitstats.h b/src/core/or/circuitstats.h index 317eeac20..930e0a9ba 100644 --- a/src/core/or/circuitstats.h +++ b/src/core/or/circuitstats.h @@ -43,7 +43,7 @@ int circuit_build_times_needs_circuits_now(const circuit_build_times_t *cbt); void circuit_build_times_init(circuit_build_times_t *cbt); void circuit_build_times_free_timeouts(circuit_build_times_t *cbt); void circuit_build_times_new_consensus_params(circuit_build_times_t *cbt, - networkstatus_t *ns); + const networkstatus_t *ns); double circuit_build_times_timeout_rate(const circuit_build_times_t *cbt); double circuit_build_times_close_rate(const circuit_build_times_t *cbt); diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 6b2c0d201..dd6c65661 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -621,7 +621,7 @@ get_estimated_address_per_node, (void)) * and grab microdescriptors into nodes as appropriate. */ void -nodelist_set_consensus(networkstatus_t *ns) +nodelist_set_consensus(const networkstatus_t *ns) { const or_options_t *options = get_options(); int authdir = authdir_mode_v3(options); @@ -952,7 +952,7 @@ nodelist_assert_ok(void) /** Ensure that the nodelist has been created with the most recent consensus. * If that's not the case, make it so. */ void -nodelist_ensure_freshness(networkstatus_t *ns) +nodelist_ensure_freshness(const networkstatus_t *ns) { tor_assert(ns); diff --git a/src/feature/nodelist/nodelist.h b/src/feature/nodelist/nodelist.h index 4ba699d69..826d1b957 100644 --- a/src/feature/nodelist/nodelist.h +++ b/src/feature/nodelist/nodelist.h @@ -32,8 +32,8 @@ const node_t *node_get_by_hex_id(const char *identity_digest, unsigned flags); node_t *nodelist_set_routerinfo(routerinfo_t *ri, routerinfo_t **ri_old_out); node_t *nodelist_add_microdesc(microdesc_t *md); -void nodelist_set_consensus(networkstatus_t *ns); -void nodelist_ensure_freshness(networkstatus_t *ns); +void nodelist_set_consensus(const networkstatus_t *ns); +void nodelist_ensure_freshness(const networkstatus_t *ns); int nodelist_probably_contains_address(const tor_addr_t *addr); void nodelist_add_addr4_to_address_set(const uint32_t addr); void nodelist_add_addr6_to_address_set(const tor_addr_t *addr);

1 0

[tor/master] Add an AssumeReachableIPv6 autobool option.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit edb023b1e74dd3b900af399126bd985fc4064857 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 15:12:57 2020 -0400 Add an AssumeReachableIPv6 autobool option. This option tells Tor that our IPv6 orport is reachable, and doesn't need to be checked. Closes the rest of 33224. --- changes/ticket33224 | 3 +++ doc/tor.1.txt | 7 ++++++- src/app/config/config.c | 5 +++++ src/app/config/or_options_st.h | 9 ++++++++- src/feature/relay/router.c | 4 ++-- src/feature/relay/selftest.c | 12 ++++++++---- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/changes/ticket33224 b/changes/ticket33224 new file mode 100644 index 000000000..3fdab7dc5 --- /dev/null +++ b/changes/ticket33224 @@ -0,0 +1,3 @@ + o Minor features (relay, IPv6): + - Add an AssumeReachableIPv6 option to disable self-checking IPv6 + reachability. Closes part of ticket 33224. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 15d5775e2..7ff31fa00 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2146,7 +2146,12 @@ is non-zero): don't do self-reachability testing; just upload your server descriptor immediately. If **AuthoritativeDirectory** is also set, this option instructs the dirserver to bypass remote reachability testing too and list - all connected servers as running. + all connected servers as running. (Default: 0) + +[[AssumeReachableIPv6]] **AssumeReachableIPv6** **0**|**1**|**auto**:: + Like **AssumeReachable**, but affects only the relay's own IPv6 ORPort. + If this value is set to "auto", then Tor will look at **AssumeReachable** + instead. (Default: auto) [[BridgeRelay]] **BridgeRelay** **0**|**1**:: Sets the relay to act as a "bridge" with respect to relaying connections diff --git a/src/app/config/config.c b/src/app/config/config.c index 286cd9304..7878fa9de 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -323,6 +323,7 @@ static const config_var_t option_vars_[] = { V(AlternateDirAuthority, LINELIST, NULL), OBSOLETE("AlternateHSAuthority"), V(AssumeReachable, BOOL, "0"), + V(AssumeReachableIPv6, AUTOBOOL, "auto"), OBSOLETE("AuthDirBadDir"), OBSOLETE("AuthDirBadDirCCs"), V(AuthDirBadExit, LINELIST, NULL), @@ -3229,6 +3230,10 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) REJECT("TokenBucketRefillInterval must be between 1 and 1000 inclusive."); } + if (options->AssumeReachable && options->AssumeReachableIPv6 == 0) { + REJECT("Cannot set AssumeReachable 1 and AssumeReachableIPv6 0."); + } + if (options->ExcludeExitNodes || options->ExcludeNodes) { options->ExcludeExitNodesUnion_ = routerset_new(); routerset_union(options->ExcludeExitNodesUnion_,options->ExcludeExitNodes); diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 2f375f5d9..07126cc6c 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -195,7 +195,14 @@ struct or_options_t { unsigned int HTTPTunnelPort_set : 1; /**@}*/ - int AssumeReachable; /**< Whether to publish our descriptor regardless. */ + /** Whether to publish our descriptor regardless of all our self-tests + */ + int AssumeReachable; + /** Whether to publish our descriptor regardless of IPv6 self-tests. + * + * This is an autobool; when set to AUTO, it uses AssumeReachable. + **/ + int AssumeReachableIPv6; int AuthoritativeDir; /**< Boolean: is this an authoritative directory? */ int V3AuthoritativeDir; /**< Boolean: is this an authoritative directory * for version 3 directories? */ diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 97b630add..d32d03fc1 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1374,13 +1374,13 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!router_orport_seems_reachable(AF_INET)) { + if (!router_orport_seems_reachable(options, AF_INET)) { // We have an ipv4 orport, and it doesn't seem reachable. if (!publish_even_when_ipv4_orport_unreachable) { return 0; } } - if (!router_orport_seems_reachable(AF_INET6)) { + if (!router_orport_seems_reachable(options, AF_INET6)) { // We have an ipv6 orport, and it doesn't seem reachable. if (!publish_even_when_ipv6_orport_unreachable) { return 0; diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 64b8578ba..ae24a0440 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -86,9 +86,8 @@ router_reachability_checks_disabled(const or_options_t *options) * orport checks. */ int -router_orport_seems_reachable( - const or_options_t *options, - int family) +router_orport_seems_reachable(const or_options_t *options, + int family) { tor_assert_nonfatal(family == AF_INET || family == AF_INET6 || family == 0); int reach_checks_disabled = router_reachability_checks_disabled(options); @@ -96,6 +95,11 @@ router_orport_seems_reachable( return true; } + // Note that we do a == 1 here, not just a boolean check. This value + // is also an autobool, so CFG_AUTO does not mean that we should + // assume IPv6 ports are reachable. + const bool ipv6_assume_reachable = (options->AssumeReachableIPv6 == 1); + // Which reachability flags should we look at? const bool checking_ipv4 = (family == AF_INET || family == 0); const bool checking_ipv6 = (family == AF_INET6 || family == 0); @@ -105,7 +109,7 @@ router_orport_seems_reachable( return false; } } - if (checking_ipv6) { + if (checking_ipv6 && !ipv6_assume_reachable) { if (have_orport_for_family(AF_INET6) && !can_reach_or_port_ipv6) { return false; }

1 0

[tor/master] Remove stub macro for router_new_consensus_params()
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit cb25f5772441e6caed4ae8b84300f32de078fe62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 26 08:32:33 2020 -0400 Remove stub macro for router_new_consensus_params() I had incorrectly believed that the router.c file was disabled when we were building with relay mode disabled. --- src/feature/relay/router.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index b1f90699a..4c557b8d0 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -34,7 +34,6 @@ void set_server_identity_key(crypto_pk_t *k); MOCK_DECL(crypto_pk_t *,get_server_identity_key,(void)); #else #define get_server_identity_key() (tor_abort_(),NULL) -#define router_new_consensus_params(c) ((void)(c)) #endif int server_identity_key_is_set(void); void set_client_identity_key(crypto_pk_t *k);

1 0

[tor/master] Merge branch 'assume_reachable_revamp'
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit dbc2b75009a781f2664b871a6033d47b04946299 Merge: 40922629f cb25f5772 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 26 08:34:56 2020 -0400 Merge branch 'assume_reachable_revamp' changes/ticket33224 | 3 +++ changes/ticket34064 | 5 ++++ doc/tor.1.txt | 7 ++++- src/app/config/config.c | 5 ++++ src/app/config/or_options_st.h | 9 ++++++- src/core/or/channelpadding.c | 2 +- src/core/or/channelpadding.h | 3 +-- src/core/or/circuitbuild.c | 2 +- src/core/or/circuitstats.c | 4 +-- src/core/or/circuitstats.h | 2 +- src/core/or/circuituse.c | 4 +-- src/feature/control/control_getinfo.c | 4 +-- src/feature/nodelist/networkstatus.c | 51 +++++++++++++++++++---------------- src/feature/nodelist/nodelist.c | 4 +-- src/feature/nodelist/nodelist.h | 4 +-- src/feature/relay/router.c | 43 +++++++++++++++++++++++++++-- src/feature/relay/router.h | 1 + src/feature/relay/selftest.c | 14 ++++++---- src/feature/relay/selftest.h | 4 +-- src/feature/stats/predict_ports.c | 2 +- 20 files changed, 123 insertions(+), 50 deletions(-)

1 0

[tor/master] addr: Look at /48 for IPv6 in is_local_addr()
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 40922629fe92a947ef3d84e71826a5030884cf08 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jun 25 13:45:05 2020 -0400 addr: Look at /48 for IPv6 in is_local_addr() Closes #33618 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/resolve_addr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 15a94cb82..c8b44de84 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -603,8 +603,10 @@ is_local_to_resolve_addr, (const tor_addr_t *addr)) return tor_addr_compare_masked(addr, last_resolved_addr, 24, CMP_SEMANTIC) == 0; case AF_INET6: - /* Look at the /32 like addrs_in_same_network_family() does. */ - return tor_addr_compare_masked(addr, last_resolved_addr, 32, + /* Look at /48 because it is typically the smallest network in the global + * IPv6 routing tables, and it was previously the recommended per-customer + * network block. (See [RFC 6177: IPv6 End Site Address Assignment].) */ + return tor_addr_compare_masked(addr, last_resolved_addr, 48, CMP_SEMANTIC) == 0; break; default:

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 26 Jun '20

26 Jun '20

commit 25b68c63fc0a02db31b1f6c8f7d7e3225f9e5981 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 09:47:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+de.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+de.po b/contents+de.po index 685318d8e9..a1521fa72f 100644 --- a/contents+de.po +++ b/contents+de.po @@ -1053,6 +1053,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Click \"Connect\" to save your " "settings." msgstr "" +"Vervollständige das CAPTCHA und klicke \"Absenden\". Klicke \"Verbinden\" um" +" deine Einstellungen zu speichern" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 26 Jun '20

26 Jun '20

commit 382df98bf39c88e8cccbea00de4eb9a5912023af Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 09:45:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ja/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index 52765f2054..e6cf4a6509 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -11,6 +11,7 @@ # タカハシ <indexial(a)outlook.jp>, 2013 # タカハシ <indexial(a)outlook.jp>, 2014 # h345u37g3 h345u37g3, 2019 +# Ito Takeshi, 2020 # Masaki Saito <rezoolab(a)gmail.com>, 2013 # 藤前　甲 <m1440809437(a)hiru-dea.com>, 2014 msgid "" @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-06-06 18:47+0000\n" -"Last-Translator: 323484\n" +"PO-Revision-Date: 2020-06-26 09:34+0000\n" +"Last-Translator: Ito Takeshi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -327,7 +328,7 @@ msgstr "" #: bridgedb/strings.py:129 msgid "Reserved" -msgstr "" +msgstr "予約済み" #: bridgedb/strings.py:130 #, python-format

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 26 Jun '20

26 Jun '20

commit 4146ae7b51bcbccc146b5ae1dbbfe33c8aa5ec21 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 09:17:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+de.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+de.po b/contents+de.po index be71cecb41..685318d8e9 100644 --- a/contents+de.po +++ b/contents+de.po @@ -13,6 +13,7 @@ # Jonas Kröber <murmel.schelm(a)gmail.com>, 2020 # Christian Nelke <christian.strozyk(a)googlemail.com>, 2020 # Simon Kirchner <twistiosplayer(a)gmail.com>, 2020 +# Leon T. <leont-de(a)outlook.de>, 2020 # msgid "" msgstr "" @@ -20,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Simon Kirchner <twistiosplayer(a)gmail.com>, 2020\n" +"Last-Translator: Leon T. <leont-de(a)outlook.de>, 2020\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2804,7 +2805,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "You can update Tor Browser automatically or manually." -msgstr "" +msgstr "Du kannst deinen Tor Browser automatisch oder manuell aktualisieren." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 25 Jun '20

25 Jun '20

commit 6a278974f975d2ee92ab93c92e1127bd7f58b19a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 20:47:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ar/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/torbutton.properties b/ar/torbutton.properties index 21e199e4d5..60cbd6b79f 100644 --- a/ar/torbutton.properties +++ b/ar/torbutton.properties @@ -72,7 +72,7 @@ onionServices.errorPage.onionSite=موقع Onion # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.descNotFound.header=لم يتم العثور على موقع Onion -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion @@ -82,7 +82,7 @@ onionServices.descInvalid.longDescription=Details: %S — The requested onion se # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.introFailed.header=موقع Onion قطع الاتصال. -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها . onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion

1 0