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

[chutney/master] Ignore the new format "Failed to find node for hop" log message
by teor＠torproject.org 12 Sep '17

12 Sep '17

commit 2e8ef42b0a7682cfbf9fb34f0c5b6e62fe06374b Author: teor <teor2345(a)gmail.com> Date: Tue Sep 12 11:56:38 2017 +1000 Ignore the new format "Failed to find node for hop" log message Fixes 23475, introduced by tor's 18982 in tor master (0.3.2.0-alpha-dev). --- tools/ignore.warnings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/ignore.warnings b/tools/ignore.warnings index 87e1b83..8384066 100644 --- a/tools/ignore.warnings +++ b/tools/ignore.warnings @@ -25,7 +25,10 @@ Error publishing .* consensus Every hidden service on this tor instance is NON-ANONYMOUS # We ignore consensus failure warnings Failed to choose an exit server +# These are 0-based Failed to find node for hop [0-1] of our path +# These are 1-based +Failed to find node for hop #[1-2] of our path # Tor Bug 21524 IPv4 address.*private.*with accept6/reject6 field type in exit policy In a future version of Tor, ExitRelay 0 may become the default when no ExitPolicy is given

1 0

[chutney/master] Add an offline mode to chutney, which disables DNS
by teor＠torproject.org 12 Sep '17

12 Sep '17

commit c889534dd5ae6620634720a4fa7a771be9858069 Author: teor <teor2345(a)gmail.com> Date: Wed May 3 09:47:31 2017 +1000 Add an offline mode to chutney, which disables DNS Using --offline makes chutney much more reliable, and removes the dependency on an external DNS resolver. Chutney automatically does this when the default /etc/resolv.conf file is missing. To use offline mode by default, set CHUTNEY_DNS_CONF="/dev/null". This change makes chutney ignore tor's compile-time ServerDNSResolvConfFile default. If you rely on a custom default for this option (which isn't /etc/resolv.conf), use --dns-conf-default or CHUTNEY_DNS_CONF="". To use a custom DNS file, use --dns-conf PATH or CHUTNEY_DNS_CONF="PATH". Closes ticket 21903, and other related tickets. --- README | 34 +++++++++++++++++++++++++++++++++- lib/chutney/TorNet.py | 38 ++++++++++++++++++++++++++++++++++++++ resolv.conf | 4 ++++ tools/ignore.warnings | 4 ++++ tools/test-network.sh | 25 +++++++++++++++++++++++++ torrc_templates/relay-non-dir.tmpl | 11 +++++++++++ 6 files changed, 115 insertions(+), 1 deletion(-) diff --git a/README b/README index 14d521a..cfa41c4 100644 --- a/README +++ b/README @@ -48,9 +48,14 @@ Traffic Options: --rounds CHUTNEY_ROUNDS=N --hs-multi-client CHUTNEY_HS_MULTI_CLIENT=N -Address Options: +Address/DNS Options: --ipv4 CHUTNEY_LISTEN_ADDRESS --ipv6 CHUTNEY_LISTEN_ADDRESS_V6 + # Chutney uses /etc/resolv.conf if none of these options are set + --dns-conf CHUTNEY_DNS_CONF=PATH + --offline CHUTNEY_DNS_CONF=/dev/null + # Use tor's compile-time default for ServerDNSResolvConfFile + --dns-conf-default CHUTNEY_DNS_CONF="" Warning Options: --all-warnings CHUTNEY_WARNINGS_IGNORE_EXPECTED=false @@ -149,6 +154,33 @@ Changing the network address: chutney verifies IPv6 client, bridge client (?), hidden service, and exit connections. It does not use IPv6 SOCKSPorts or HiddenServicePorts. +Using DNS: + + Chutney verify uses IP addresses by default. It does not need to look up + any hostnames. We recommend that chutney users disable DNS using --offline + or CHUTNEY_DNS_CONF=/dev/null , because any DNS failures causes tests to + fail. Chutney's DNS queries also produce external traffic in a predictable + pattern. + + If you want to use a hostname with CHUTNEY_LISTEN_ADDRESS[_V6], or you want + to run tests that use DNS, set CHUTNEY_DNS_CONF to the path to a file in + resolv.conf format. Chutney's default of /etc/resolv.conf should be fine for + most UNIX-based operating systems. If your tor is compiled with a different + default, use --dns-resolv-conf-default or CHUTNEY_DNS_CONF="". + + When the CHUTNEY_DNS_CONF file does not exist, or is a broken symlink, + chutney uses /dev/null instead. This is a workaround for bugs in tor's + use of eventdns. For example, macOS deletes the resolv.conf file when it + thinks the network is down: this can make tor exits reject all traffic, + even if a working DNS server is running on 127.0.0.1:53. + + When tor has no working name servers (including --offline mode), it can + crash on SETCONF. (Chutney does not use SETCONF, but some external tor + controllers do.) To avoid this crash, set CHUTNEY_DNS_CONF to a file + containing a working name server address. For your convenience, chutney + provides a local resolv.conf file containing IPv4, IPv6, and "localhost". + Use --dns-conf resolv.conf (relative paths work). + The configuration files: networks/basic holds the configuration for the network you're configuring above. It refers to some torrc template files in torrc_templates/. diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 9ccf4a5..3ace8a7 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -756,6 +756,10 @@ DEFAULTS = { 'controlling_pid': (int(os.environ.get('CHUTNEY_CONTROLLING_PID', 0)) if 'CHUTNEY_CONTROLLING_PID' in os.environ else None), + # a DNS config file (for ServerDNSResolvConfFile) + 'dns_conf': (os.environ.get('CHUTNEY_DNS_CONF', '/etc/resolv.conf') + if 'CHUTNEY_DNS_CONF' in os.environ + else None), } @@ -775,6 +779,10 @@ class TorEnviron(chutney.Templating.Environ): hs_hostname: the hostname of the key generated by a hidden service owning_controller_process: the __OwningControllerProcess torrc line, disabled if tor should continue after the script exits + server_dns_resolv_conf: the ServerDNSResolvConfFile torrc line, + disabled if tor should use the default DNS conf. + If the dns_conf file is missing, this option is also disabled: + otherwise, exits would not work due to tor bug #21900. Environment fields used: nodenum: chutney's internal node number for the node @@ -792,6 +800,8 @@ class TorEnviron(chutney.Templating.Environ): hs-hostname (note hyphen): cached hidden service hostname value controlling_pid: the PID of the controlling process. After this process exits, the child tor processes will exit + dns_conf: the path to a DNS config file for Tor Exits. If this file + is empty or unreadable, Tor will try 127.0.0.1:53. """ def __init__(self, parent=None, **kwargs): @@ -867,6 +877,34 @@ class TorEnviron(chutney.Templating.Environ): else: return ocp_line + # the default resolv.conf path is set at compile time + # there's no easy way to get it out of tor, so we use the typical value + DEFAULT_DNS_RESOLV_CONF = "/etc/resolv.conf" + # if we can't find the specified file, use this one as a substitute + OFFLINE_DNS_RESOLV_CONF = "/dev/null" + + def _get_server_dns_resolv_conf(self, my): + if my['dns_conf'] == "": + # if the user asked for tor's default + return "#ServerDNSResolvConfFile using tor's compile-time default" + elif my['dns_conf'] is None: + # if there is no DNS conf file set + print("CHUTNEY_DNS_CONF not specified, using '%s'." + % (DEFAULT_DNS_RESOLV_CONF)) + dns_conf = DEFAULT_DNS_RESOLV_CONF + else: + dns_conf = my['dns_conf'] + dns_conf = os.path.abspath(my['dns_conf']) + # work around Tor bug #21900, where exits fail when the DNS conf + # file does not exist, or is a broken symlink + # (os.path.exists returns False for broken symbolic links) + if not os.path.exists(dns_conf): + # Issue a warning so the user notices + print("CHUTNEY_DNS_CONF '%s' does not exist, using '%s'." + % (dns_conf, OFFLINE_DNS_RESOLV_CONF)) + dns_conf = OFFLINE_DNS_RESOLV_CONF + return "ServerDNSResolvConfFile %s" % (dns_conf) + class Network(object): diff --git a/resolv.conf b/resolv.conf new file mode 100644 index 0000000..98944a1 --- /dev/null +++ b/resolv.conf @@ -0,0 +1,4 @@ +# Use localhost as the resolver +127.0.0.1 +::1 +localhost diff --git a/tools/ignore.warnings b/tools/ignore.warnings index 8384066..5429533 100644 --- a/tools/ignore.warnings +++ b/tools/ignore.warnings @@ -19,6 +19,8 @@ Consensus with empty bandwidth Could not add queued signature to new consensus: Mismatched digest Could not add queued signature to new consensus: Valid-After times do not match Could not open.*sr-state.*No such file or directory +# Chutney does not use DNS by default +Couldn't set up any working nameservers. Network not up yet Currently, sandboxing is only implemented on Linux # We ignore consensus failure warnings Error publishing .* consensus @@ -50,6 +52,8 @@ TestingTorNetwork is set # Older versions might need them, we should remove them at some point in 0.3.* The DirAuthority options 'hs' and 'no-hs' are obsolete This copy of Tor was compiled.*to run in a non-anonymous mode +# Chutney does not use DNS by default +Unable to parse '.*', or no nameservers in '.*' # Tor Bug 21525? Unable to store signatures posted by .* Mismatched digest Unable to store signatures posted by .* Valid-After times do not match diff --git a/tools/test-network.sh b/tools/test-network.sh index 2be5558..e893e80 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -15,6 +15,10 @@ export CHUTNEY_WARNINGS_SUMMARY=${CHUTNEY_WARNINGS_SUMMARY:-true} # default to exiting when this script exits export CHUTNEY_CONTROLLING_PID=${CHUTNEY_CONTROLLING_PID:-$$} +# default to no DNS: this is a safe, working default for most users +# If a custom test expects DNS, it needs to set CHUTNEY_DNS_CONF +export CHUTNEY_DNS_CONF=${CHUTNEY_DNS_CONF:-/dev/null} + # what we say when we fail UPDATE_YOUR_CHUTNEY="Please update your chutney using 'git pull'." @@ -111,6 +115,21 @@ do export CHUTNEY_LISTEN_ADDRESS_V6="$2" shift ;; + # The DNS server config for Tor Exits. Chutney's default is + # /etc/resolv.conf, even if tor's compile time default is different. + --dns-conf) + export CHUTNEY_DNS_CONF="$2" + shift + ;; + # Do not make any DNS queries. This is incompatible with external + # controllers that use SETCONF. + --offline) + export CHUTNEY_DNS_CONF="/dev/null" + ;; + # Use tor's compile-time default for ServerDNSResolvConfFile. + --dns-conf-default) + export CHUTNEY_DNS_CONF="" + ;; # Warning Options # we summarise unexpected warnings by default # this shows all warnings per-node @@ -158,6 +177,12 @@ do shift done +# If the DNS server doesn't work, tor exits may reject all exit traffic, and +# chutney may fail +if [ "$CHUTNEY_WARNINGS_ONLY" != true ]; then + $ECHO "$myname: using CHUTNEY_DNS_CONF '$CHUTNEY_DNS_CONF'" +fi + # optional: $TOR_DIR is the tor build directory # it's used to find the location of tor binaries # if it's not set: diff --git a/torrc_templates/relay-non-dir.tmpl b/torrc_templates/relay-non-dir.tmpl index b2899f7..560ebdf 100644 --- a/torrc_templates/relay-non-dir.tmpl +++ b/torrc_templates/relay-non-dir.tmpl @@ -15,3 +15,14 @@ ExitRelay 0 # then half the minimum testing consensus interval TestingServerDownloadSchedule 0, 5 TestingServerConsensusDownloadSchedule 0, 5 + +# These options are set here so they apply to IPv4 and IPv6 Exits +# +# Tell Exits to avoid using DNS: otherwise, chutney will fail if DNS fails +# (Chutney only accesses 127.0.0.1 and ::1, so it doesn't need DNS) +ServerDNSDetectHijacking 0 +ServerDNSTestAddresses +# If this option is /dev/null, or any other empty or unreadable file, tor exits +# will not use DNS. Otherwise, DNS is enabled with this config. +# (If the following line is commented out, tor uses /etc/resolv.conf.) +${server_dns_resolv_conf}

1 0

[chutney/master] Introduce hs-v3 network file and temlate.
by teor＠torproject.org 12 Sep '17

12 Sep '17

commit b96614275f251da9229183046cd63ba9a44166a7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Aug 31 11:32:16 2017 -0400 Introduce hs-v3 network file and temlate. This is a chutney network with next generation hidden services. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- networks/hs-v3 | 16 ++++++++++++++++ networks/hs-v3-intro | 18 ++++++++++++++++++ networks/hs-v3-min | 17 +++++++++++++++++ torrc_templates/hs-v3-10.tmpl | 2 ++ torrc_templates/hs-v3.tmpl | 2 ++ torrc_templates/hs3-only-v6.tmpl | 3 +++ torrc_templates/hs3-use-v6.tmpl | 3 +++ torrc_templates/single-onion-v3-indirect.tmpl | 6 ++++++ torrc_templates/single-onion-v3-only-v6.tmpl | 3 +++ torrc_templates/single-onion-v3-use-v6.tmpl | 3 +++ torrc_templates/single-onion-v3.tmpl | 2 ++ 11 files changed, 75 insertions(+) diff --git a/networks/hs-v3 b/networks/hs-v3 new file mode 100644 index 0000000..ea67f79 --- /dev/null +++ b/networks/hs-v3 @@ -0,0 +1,16 @@ +# Next gen hidden services config + +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") + +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +# We need 5 authorities/relays/exits to ensure we can build HS connections +NODES = Authority.getN(3) + ExitRelay.getN(5) + \ + Client.getN(1) + HS.getN(1) + +ConfigureNodes(NODES) + diff --git a/networks/hs-v3-intro b/networks/hs-v3-intro new file mode 100644 index 0000000..6dc39f2 --- /dev/null +++ b/networks/hs-v3-intro @@ -0,0 +1,18 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS10 = Node(tag="h", hs=1, torrc="hs-v3-10.tmpl") + +# Since only 25% of relays get the guard flag, +# TestingDirAuthVoteGuard * may need to be used in small networks + +# A hidden service needs 5 authorities/relays to ensure it can build HS +# connections: +# a minimum path length of 3, plus the client-nominated rendezvous point, +# plus a seperate introduction point +# A hidden service with 10 intro points actually tries 12, then repurposes 2 +NODES = Authority.getN(2) + NonExitRelay.getN(10) + \ + Client.getN(1) + HS10.getN(2) + +ConfigureNodes(NODES) diff --git a/networks/hs-v3-min b/networks/hs-v3-min new file mode 100644 index 0000000..9812a31 --- /dev/null +++ b/networks/hs-v3-min @@ -0,0 +1,17 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") + +# Since only 25% of relays get the guard flag, +# TestingDirAuthVoteGuard * may need to be used in small networks + +# A hidden service needs 5 authorities/relays to ensure it can build HS +# connections: +# a minimum path length of 3, plus the client-nominated rendezvous point, +# plus a seperate introduction point +NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ + Client.getN(1) + HS.getN(1) + +ConfigureNodes(NODES) diff --git a/torrc_templates/hs-v3-10.tmpl b/torrc_templates/hs-v3-10.tmpl new file mode 100644 index 0000000..0be6ef1 --- /dev/null +++ b/torrc_templates/hs-v3-10.tmpl @@ -0,0 +1,2 @@ +${include:hs-v3.tmpl} +HiddenServiceNumIntroductionPoints 10 diff --git a/torrc_templates/hs-v3.tmpl b/torrc_templates/hs-v3.tmpl new file mode 100644 index 0000000..27f031f --- /dev/null +++ b/torrc_templates/hs-v3.tmpl @@ -0,0 +1,2 @@ +${include:hs.tmpl} +HiddenServiceVersion 3 diff --git a/torrc_templates/hs3-only-v6.tmpl b/torrc_templates/hs3-only-v6.tmpl new file mode 100644 index 0000000..0ff8759 --- /dev/null +++ b/torrc_templates/hs3-only-v6.tmpl @@ -0,0 +1,3 @@ +${include:hs-v3.tmpl} +# Hidden services are just another kind of client +${include:client-only-v6.i} diff --git a/torrc_templates/hs3-use-v6.tmpl b/torrc_templates/hs3-use-v6.tmpl new file mode 100644 index 0000000..51e3700 --- /dev/null +++ b/torrc_templates/hs3-use-v6.tmpl @@ -0,0 +1,3 @@ +${include:hs-v3.tmpl} +# Hidden services are just another kind of client +${include:client-use-v6.i} diff --git a/torrc_templates/single-onion-v3-indirect.tmpl b/torrc_templates/single-onion-v3-indirect.tmpl new file mode 100644 index 0000000..8cf6cd6 --- /dev/null +++ b/torrc_templates/single-onion-v3-indirect.tmpl @@ -0,0 +1,6 @@ +${include:single-onion-v3.tmpl} + +# Only allow direct connections to the first directory authority's ORPort +# This checks that a single onion service makes 3-hop connections to +# unreachable intro points and rend points +ReachableAddresses 127.0.0.1:5000 diff --git a/torrc_templates/single-onion-v3-only-v6.tmpl b/torrc_templates/single-onion-v3-only-v6.tmpl new file mode 100644 index 0000000..7427cd7 --- /dev/null +++ b/torrc_templates/single-onion-v3-only-v6.tmpl @@ -0,0 +1,3 @@ +${include:single-onion-v3.tmpl} +# Onion services are just another kind of client +${include:client-only-v6.i} diff --git a/torrc_templates/single-onion-v3-use-v6.tmpl b/torrc_templates/single-onion-v3-use-v6.tmpl new file mode 100644 index 0000000..25a6636 --- /dev/null +++ b/torrc_templates/single-onion-v3-use-v6.tmpl @@ -0,0 +1,3 @@ +${include:single-onion-v3.tmpl} +# Onion services are just another kind of client +${include:client-use-v6.i} diff --git a/torrc_templates/single-onion-v3.tmpl b/torrc_templates/single-onion-v3.tmpl new file mode 100644 index 0000000..a9b1a19 --- /dev/null +++ b/torrc_templates/single-onion-v3.tmpl @@ -0,0 +1,2 @@ +${include:single-onion.tmpl} +${include:hs-v3.tmpl}

1 0

[chutney/master] Update the README with expected values for environmental variables
by teor＠torproject.org 12 Sep '17

12 Sep '17

commit bd1d5bd052c60f379b459aaf0fa156a485ff8196 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 12 15:46:38 2017 +1000 Update the README with expected values for environmental variables --- README | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index cfa41c4..8d4bb72 100644 --- a/README +++ b/README @@ -37,9 +37,9 @@ You can modify its configuration using command-line arguments, or use the chutney environmental variables documented below: Timing Options: - --start-time CHUTNEY_START_TIME - --bootstrap-time CHUTNEY_BOOTSTRAP_TIME - --stop-time CHUTNEY_STOP_TIME + --start-time CHUTNEY_START_TIME=N + --bootstrap-time CHUTNEY_BOOTSTRAP_TIME=N + --stop-time CHUTNEY_STOP_TIME=N Traffic Options: --data CHUTNEY_DATA_BYTES=N @@ -49,8 +49,8 @@ Traffic Options: --hs-multi-client CHUTNEY_HS_MULTI_CLIENT=N Address/DNS Options: - --ipv4 CHUTNEY_LISTEN_ADDRESS - --ipv6 CHUTNEY_LISTEN_ADDRESS_V6 + --ipv4 CHUTNEY_LISTEN_ADDRESS=IPV4 + --ipv6 CHUTNEY_LISTEN_ADDRESS_V6=IPV6 # Chutney uses /etc/resolv.conf if none of these options are set --dns-conf CHUTNEY_DNS_CONF=PATH --offline CHUTNEY_DNS_CONF=/dev/null @@ -69,8 +69,8 @@ Expert Options: --dry-run NETWORK_DRY_RUN=true --quiet ECHO=true - --controlling-pid CHUTNEY_CONTROLLING_PID - --net-dir CHUTNEY_DATA_DIR + --controlling-pid CHUTNEY_CONTROLLING_PID=N + --net-dir CHUTNEY_DATA_DIR=PATH (These are advanced options: in the past, they have had long-standing bugs.) Standard Actions:

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit 16b81b966ffed4755516194c3009e09d67d22021 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 05:46:14 2017 +0000 Update translations for tor-launcher-properties --- am/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am/torlauncher.properties b/am/torlauncher.properties index 64c9728fa..5084bdd2f 100644 --- a/am/torlauncher.properties +++ b/am/torlauncher.properties @@ -32,7 +32,7 @@ torlauncher.recommended_bridge=(የሚመከር) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.quit=አቋርጥ torlauncher.quit_win=ቅጣ torlauncher.done=Done

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit 487c8df3b45c868be903f92f598625fd907b40c8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 01:47:44 2017 +0000 Update translations for tor-and-https --- am.po | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/am.po b/am.po index b1c3c213e..f373e78ae 100644 --- a/am.po +++ b/am.po @@ -3,10 +3,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Amharic (http://www.transifex.com/projects/p/torproject/language/am/)\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2017-09-12 01:24+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" +"Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,107 +29,107 @@ msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Site.com" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "user / pw" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "data" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "location" msgstr "" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "WiFi" msgstr "" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "ISP" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Hacker" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Lawyer" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Sysadmin" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Police" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Tor relay" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Key" -msgstr "" +msgstr "ቁልፍ" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Internet connection" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" msgstr ""

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit 0aee6f680e2965955adaaac2ccfdafb35551955e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 01:17:58 2017 +0000 Update translations for tails-openpgp-applet --- am/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am/openpgp-applet.pot b/am/openpgp-applet.pot index de8f5efb2..f0ad30164 100644 --- a/am/openpgp-applet.pot +++ b/am/openpgp-applet.pot @@ -27,7 +27,7 @@ msgstr "" #: bin/openpgp-applet:175 msgid "Exit" -msgstr "" +msgstr "ቅጣ " #: bin/openpgp-applet:177 msgid "About"

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit 7ed72dc045d8e049cdca1dfdd2f0e7055799d9f1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 01:16:15 2017 +0000 Update translations for tor-launcher-properties --- am/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am/torlauncher.properties b/am/torlauncher.properties index ab9e56247..64c9728fa 100644 --- a/am/torlauncher.properties +++ b/am/torlauncher.properties @@ -33,7 +33,7 @@ torlauncher.recommended_bridge=(የሚመከር) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=ቅጣ torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit b30d087c4146a0f9a7d52f71e9d6a4009afa906c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 00:47:14 2017 +0000 Update translations for torbutton-torbuttondtd --- am/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am/torbutton.dtd b/am/torbutton.dtd index cb89155f0..269d81478 100644 --- a/am/torbutton.dtd +++ b/am/torbutton.dtd @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> +<!ENTITY torbutton.prefs.sec_medium "መገናኛ "> <!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit 41249110a82c326eb77ef6f0a9a357cccd01161e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 00:45:05 2017 +0000 Update translations for bridgedb --- am/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/am/LC_MESSAGES/bridgedb.po b/am/LC_MESSAGES/bridgedb.po index d5797b11b..5717abbba 100644 --- a/am/LC_MESSAGES/bridgedb.po +++ b/am/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-11 05:24+0000\n" +"PO-Revision-Date: 2017-09-12 00:37+0000\n" "Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" "Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgstr "" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "የለወጥ መዝገብ " #: bridgedb/https/templates/base.html:88 msgid "Contact"

1 0