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

[tor/master] Stop using default authorities with both Alternate Dir and Bridge Authority
by nickm＠torproject.org 09 Oct '14

09 Oct '14

commit c1dd43d823c74f59f8ba0eff90f6ddab6763f408 Author: teor <teor2345(a)gmail.com> Date: Wed Oct 1 18:37:19 2014 +1000 Stop using default authorities with both Alternate Dir and Bridge Authority Stop using the default authorities in networks which provide both AlternateDirAuthority and AlternateBridgeAuthority. This bug occurred due to an ambiguity around the use of NO_DIRINFO. (Does it mean "any" or "none"?) Partially fixes bug 13163. --- ...163-stop-AlternateAuthorities-always-using-default-authorities | 4 ++++ src/or/config.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug13163-stop-AlternateAuthorities-always-using-default-authorities b/changes/bug13163-stop-AlternateAuthorities-always-using-default-authorities new file mode 100644 index 0000000..eeaca92 --- /dev/null +++ b/changes/bug13163-stop-AlternateAuthorities-always-using-default-authorities @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Stop using the default authorities in networks which provide both + AlternateDirAuthority and AlternateBridgeAuthority. + Partially fixes bug 13163. diff --git a/src/or/config.c b/src/or/config.c index 921d032..493cfcd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -959,7 +959,10 @@ consider_adding_dir_servers(const or_options_t *options, type |= BRIDGE_DIRINFO; if (!options->AlternateDirAuthority) type |= V3_DIRINFO | EXTRAINFO_DIRINFO | MICRODESC_DIRINFO; - add_default_trusted_dir_authorities(type); + /* if type == NO_DIRINFO, we don't want to add any of the + * default authorities, because we've replaced them all */ + if (type != NO_DIRINFO) + add_default_trusted_dir_authorities(type); } if (!options->FallbackDir) add_default_fallback_dir_servers();

1 0

[tor/master] Improve DIRINFO flags' usage comments
by nickm＠torproject.org 09 Oct '14

09 Oct '14

commit ff42222845f5d79f27b653990cab4f20ad91a068 Author: teor <teor2345(a)gmail.com> Date: Wed Oct 1 18:54:26 2014 +1000 Improve DIRINFO flags' usage comments Document usage of the NO_DIRINFO and ALL_DIRINFO flags clearly in functions which take them as arguments. Replace 0 with NO_DIRINFO in a function call for clarity. Seeks to prevent future issues like 13163. --- changes/issue13163-improve-DIRINFO-flags-comments | 5 +++++ src/or/config.c | 9 ++++++--- src/or/directory.c | 6 +++--- src/or/entrynodes.c | 13 ++++++++----- src/or/routerlist.c | 2 +- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/changes/issue13163-improve-DIRINFO-flags-comments b/changes/issue13163-improve-DIRINFO-flags-comments new file mode 100644 index 0000000..3acb1f3 --- /dev/null +++ b/changes/issue13163-improve-DIRINFO-flags-comments @@ -0,0 +1,5 @@ + o Minor refactoring: + - Document usage of the NO_DIRINFO and ALL_DIRINFO flags clearly in + functions which take them as arguments. Replace 0 with NO_DIRINFO + in a function call for clarity. + Seeks to prevent future issues like 13163. diff --git a/src/or/config.c b/src/or/config.c index 493cfcd..cacf52a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -817,7 +817,9 @@ escaped_safe_str(const char *address) } /** Add the default directory authorities directly into the trusted dir list, - * but only add them insofar as they share bits with type. */ + * but only add them insofar as they share bits with type. + * Each authority's bits are restricted to the bits shared with type. + * If type is ALL_DIRINFO or NO_DIRINFO (zero), add all authorities. */ static void add_default_trusted_dir_authorities(dirinfo_type_t type) { @@ -5194,8 +5196,9 @@ parse_server_transport_line(const or_options_t *options, /** Read the contents of a DirAuthority line from line. If * validate_only is 0, and the line is well-formed, and it * shares any bits with required_type or required_type - * is 0, then add the dirserver described in the line (minus whatever - * bits it's missing) as a valid authority. Return 0 on success, + * is NO_DIRINFO (zero), then add the dirserver described in the line + * (minus whatever bits it's missing) as a valid authority. + * Return 0 on success or filtering out by type, * or -1 if the line isn't well-formed or if we can't add it. */ static int parse_dir_authority_line(const char *line, dirinfo_type_t required_type, diff --git a/src/or/directory.c b/src/or/directory.c index 1aaa75c..12717eb 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -523,12 +523,12 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, /* anybody with a non-zero dirport will do. Disregard firewalls. */ pds_flags |= PDS_IGNORE_FASCISTFIREWALL; rs = router_pick_directory_server(type, pds_flags); - /* If we have any hope of building an indirect conn, we know some router - * descriptors. If (rs==NULL), we can't build circuits anyway, so - * there's no point in falling back to the authorities in this case. */ } } + /* If we have any hope of building an indirect conn, we know some router + * descriptors. If (rs==NULL), we can't build circuits anyway, so + * there's no point in falling back to the authorities in this case. */ if (rs) { const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS : DIRIND_ONEHOP; diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index b1fd310..b160235 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1003,7 +1003,8 @@ node_understands_microdescriptors(const node_t *node) } /** Return true iff node is able to answer directory questions - * of type dirinfo. */ + * of type dirinfo. Always returns true if dirinfo is + * NO_DIRINFO (zero). */ static int node_can_handle_dirinfo(const node_t *node, dirinfo_type_t dirinfo) { @@ -1025,13 +1026,13 @@ node_can_handle_dirinfo(const node_t *node, dirinfo_type_t dirinfo) * state is non-NULL, this is for a specific circuit -- * make sure not to pick this circuit's exit or any node in the * exit's family. If state is NULL, we're looking for a random - * guard (likely a bridge). If dirinfo is not NO_DIRINFO, then - * only select from nodes that know how to answer directory questions + * guard (likely a bridge). If dirinfo is not NO_DIRINFO (zero), + * then only select from nodes that know how to answer directory questions * of that type. */ const node_t * choose_random_entry(cpath_build_state_t *state) { - return choose_random_entry_impl(state, 0, 0, NULL); + return choose_random_entry_impl(state, 0, NO_DIRINFO, NULL); } /** Pick a live (up and listed) directory guard from entry_guards for @@ -1139,7 +1140,9 @@ populate_live_entry_guards(smartlist_t *live_entry_guards, * If for_directory is set, we are looking for a directory guard. * * dirinfo_type contains the kind of directory information we - * are looking for in our node. + * are looking for in our node, or NO_DIRINFO (zero) if we are not + * looking for any particular directory information (when set to + * NO_DIRINFO, the dirinfo_type filter is ignored). * * If n_options_out is set, we set it to the number of * candidate guard nodes we had before picking a specific guard node. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 22489a4..e93482a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2534,7 +2534,7 @@ router_is_named(const routerinfo_t *router) /** Return true iff digest is the digest of the identity key of a * trusted directory matching at least one bit of type. If type - * is zero, any authority is okay. */ + * is zero (NO_DIRINFO), or ALL_DIRINFO, any authority is okay. */ int router_digest_is_trusted_dir_type(const char *digest, dirinfo_type_t type) {

1 0

[tor/master] Bitwise check BRIDGE_DIRINFO
by nickm＠torproject.org 09 Oct '14

09 Oct '14

commit 31bf8f26907945b8f26a7543e42ce0e92dd4918f Author: teor <teor2345(a)gmail.com> Date: Wed Oct 1 19:04:04 2014 +1000 Bitwise check BRIDGE_DIRINFO Bitwise check for the BRIDGE_DIRINFO flag, rather than checking for equality. Fixes a (potential) bug where directories offering BRIDGE_DIRINFO, and some other flag (i.e. microdescriptors or extrainfo), would be ignored when looking for bridge directories. Final fix in series for bug 13163. --- changes/bug13163-bitwise-check-BRIDGE-DIRINFO | 5 +++++ src/or/directory.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug13163-bitwise-check-BRIDGE-DIRINFO b/changes/bug13163-bitwise-check-BRIDGE-DIRINFO new file mode 100644 index 0000000..7f5ec05 --- /dev/null +++ b/changes/bug13163-bitwise-check-BRIDGE-DIRINFO @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Bitwise check the BRIDGE_DIRINFO flag rather than using equality. + Fixes a (potential) bug where directories offering BRIDGE_DIRINFO and + some other flag (i.e. microdescriptors or extrainfo) would be ignored + when looking for bridge directories. Partially fixes bug 13163. diff --git a/src/or/directory.c b/src/or/directory.c index 12717eb..83cc56f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -452,7 +452,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, return; if (!get_via_tor) { - if (options->UseBridges && type != BRIDGE_DIRINFO) { + if (options->UseBridges && !(type & BRIDGE_DIRINFO)) { /* We want to ask a running bridge for which we have a descriptor. * * When we ask choose_random_entry() for a bridge, we specify what @@ -479,7 +479,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, "nodes are available yet."); return; } else { - if (prefer_authority || type == BRIDGE_DIRINFO) { + if (prefer_authority || (type & BRIDGE_DIRINFO)) { /* only ask authdirservers, and don't ask myself */ rs = router_pick_trusteddirserver(type, pds_flags); if (rs == NULL && (pds_flags & (PDS_NO_EXISTING_SERVERDESC_FETCH| @@ -506,7 +506,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, return; } } - if (!rs && type != BRIDGE_DIRINFO) { + if (!rs && !(type & BRIDGE_DIRINFO)) { /* */ rs = directory_pick_generic_dirserver(type, pds_flags, dir_purpose);

1 0

[tor/master] Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed'
by nickm＠torproject.org 09 Oct '14

09 Oct '14

commit e5f9f287ced36e18241e250d4b63603b9c4f006f Merge: cc5571e 31bf8f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 9 10:55:09 2014 -0400 Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed' changes/bug13163-bitwise-check-BRIDGE-DIRINFO | 5 +++++ ...AlternateAuthorities-always-using-default-authorities | 4 ++++ changes/issue13163-improve-DIRINFO-flags-comments | 5 +++++ src/or/config.c | 14 ++++++++++---- src/or/directory.c | 12 ++++++------ src/or/entrynodes.c | 13 ++++++++----- src/or/routerlist.c | 2 +- 7 files changed, 39 insertions(+), 16 deletions(-)

1 0

[chutney/master] refactor argument parsing into parseArgs
by nickm＠torproject.org 09 Oct '14

09 Oct '14

commit e75aab6f64392d545e48d4684f931ff894983003 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Thu Mar 27 21:51:55 2014 -0400 refactor argument parsing into parseArgs --- lib/chutney/TorNet.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 3685ec0..154cb71 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -733,19 +733,23 @@ def runConfigFile(verb, f): return getattr(network,verb)() +def parseArgs(): + if len(sys.argv) < 3: + print usage(_THE_NETWORK) + print "Error: Not enough arguments given." + sys.exit(1) + + return {'network_cfg': sys.argv[2], 'action': sys.argv[1]} + def main(): global _BASE_ENVIRON global _THE_NETWORK _BASE_ENVIRON = TorEnviron(chutney.Templating.Environ(**DEFAULTS)) _THE_NETWORK = Network(_BASE_ENVIRON) - if len(sys.argv) < 3: - print usage(_THE_NETWORK) - print "Error: Not enough arguments given." - sys.exit(1) - - f = open(sys.argv[2]) - result = runConfigFile(sys.argv[1], f) + args = parseArgs() + f = open(args['network_cfg']) + result = runConfigFile(args['action'], f) if result is False: return -1 return 0

1 0

[chutney/master] check none exist network file
by nickm＠torproject.org 09 Oct '14

09 Oct '14

commit 489bc2b46362d8d3644d4c7862b3fe8d982d9742 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Thu Mar 27 21:59:24 2014 -0400 check none exist network file --- lib/chutney/TorNet.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 154cb71..042610c 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -717,6 +717,11 @@ def usage(network): "Known commands are: %s" % ( " ".join(x for x in dir(network) if not x.startswith("_")))]) +def exit_on_error(err_msg): + print "Error: {0}\n".format(err_msg) + print usage(_THE_NETWORK) + sys.exit(1) + def runConfigFile(verb, f): _GLOBALS = dict(_BASE_ENVIRON= _BASE_ENVIRON, Node=Node, @@ -735,10 +740,9 @@ def runConfigFile(verb, f): def parseArgs(): if len(sys.argv) < 3: - print usage(_THE_NETWORK) - print "Error: Not enough arguments given." - sys.exit(1) - + exit_on_error("Not enough arguments given.") + if not os.path.isfile(sys.argv[2]): + exit_on_error("Cannot find networkfile: {0}.".format(sys.argv[2])) return {'network_cfg': sys.argv[2], 'action': sys.argv[1]} def main():

1 0

[chutney/master] Merge remote-tracking branch 'houqp/miss_network_error'
by nickm＠torproject.org 09 Oct '14

09 Oct '14

commit d91cf28d17c31ba57d94fe8a9acaecff287473a0 Merge: f5f6773 489bc2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 9 10:49:02 2014 -0400 Merge remote-tracking branch 'houqp/miss_network_error' lib/chutney/TorNet.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --cc lib/chutney/TorNet.py index f18503a,042610c..7e64035 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@@ -859,15 -712,18 +859,20 @@@ def ConfigureNodes(nodelist) if n._env['bridgeauthority']: network._dfltEnv['hasbridgeauth'] = True + def usage(network): return "\n".join(["Usage: chutney {command} {networkfile}", - "Known commands are: %s" % ( - " ".join(x for x in dir(network) if not x.startswith("_")))]) + "Known commands are: %s" % ( + " ".join(x for x in dir(network) if not x.startswith("_")))]) + + def exit_on_error(err_msg): + print "Error: {0}\n".format(err_msg) + print usage(_THE_NETWORK) + sys.exit(1) + def runConfigFile(verb, f): - _GLOBALS = dict(_BASE_ENVIRON= _BASE_ENVIRON, + _GLOBALS = dict(_BASE_ENVIRON=_BASE_ENVIRON, Node=Node, ConfigureNodes=ConfigureNodes, _THE_NETWORK=_THE_NETWORK) @@@ -880,27 -736,24 +885,30 @@@ print "Error: I don't know how to %s." % verb return - return getattr(network,verb)() + return getattr(network, verb)() + + def parseArgs(): + if len(sys.argv) < 3: + exit_on_error("Not enough arguments given.") + if not os.path.isfile(sys.argv[2]): + exit_on_error("Cannot find networkfile: {0}.".format(sys.argv[2])) + return {'network_cfg': sys.argv[2], 'action': sys.argv[1]} + def main(): global _BASE_ENVIRON + global _TORRC_OPTIONS global _THE_NETWORK _BASE_ENVIRON = TorEnviron(chutney.Templating.Environ(**DEFAULTS)) + # _TORRC_OPTIONS gets initialised on demand as a map of + # "/path/to/tor" => ["SupportedOption1", "SupportedOption2", ...] + # Or it can be pre-populated as a static whitelist of options + _TORRC_OPTIONS = dict() _THE_NETWORK = Network(_BASE_ENVIRON) - if len(sys.argv) < 3: - print usage(_THE_NETWORK) - print "Error: Not enough arguments given." - sys.exit(1) - - f = open(sys.argv[2]) - result = runConfigFile(sys.argv[1], f) + args = parseArgs() + f = open(args['network_cfg']) + result = runConfigFile(args['action'], f) if result is False: return -1 return 0

1 0

[tor-browser-bundle/master] Put the *.dmg files in the sha256sums.txt, too.
by gk＠torproject.org 09 Oct '14

09 Oct '14

commit 482b8d3f2e84e74ef29c24ab8f66739d1cd3cb0b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 9 16:15:58 2014 +0000 Put the *.dmg files in the sha256sums.txt, too. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index d46fd30..5153c9b 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -44,7 +44,7 @@ if [ $status = done ]; then echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 - sha256sum *.tar.xz *.zip *.exe > sha256sums.txt + sha256sum *.tar.xz *.dmg *.exe > sha256sums.txt gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR)

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 09 Oct '14

09 Oct '14

commit 32c33203077612435b8a510659472e48b947e1e5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 9 11:16:24 2014 +0000 Update translations for tor-and-https_completed --- eu.po | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/eu.po b/eu.po new file mode 100644 index 0000000..2098fbb --- /dev/null +++ b/eu.po @@ -0,0 +1,137 @@ +# +# Translators: +# Egoitz Rodriguez Obieta <egoitzro(a)gmail.com>, 2014 +# Egoitz Rodriguez Obieta <egoitzro(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2014-10-09 10:50+0000\n" +"Last-Translator: Egoitz Rodriguez Obieta <egoitzro(a)gmail.com>\n" +"Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. (itstool) path: C/tor-and-https.svg/svg@direction +#. (itstool) comment: C/tor-and-https.svg/svg@direction +#. Specify "ltr" for left-to-right languages or "rtl" for right-to-left +#. languages (e.g. Arabic or Hebrew). +#: C/tor-and-https.svg:3 +msgid "ltr" +msgstr "ltr" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 +#, no-wrap +msgid "Tor and HTTPS" +msgstr "Tor eta HTTPS" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Site.com" +msgstr "Site.com" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "user / pw" +msgstr "erabiltzaile / pasahitza" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "data" +msgstr "datuak" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "location" +msgstr "kokapena" + +#. (itstool) path: defs/text +#. Keep it short: 3em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "WiFi" +msgstr "WiFi" + +#. (itstool) path: defs/text +#. Keep it short: 4em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "ISP" +msgstr "ISP" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Hacker" +msgstr "Hacker-a" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Lawyer" +msgstr "Legelaria" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Sysadmin" +msgstr "Sistema administratzaile" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Police" +msgstr "Polizia" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "NSA" +msgstr "NSA" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Tor relay" +msgstr "Tor erreleboan" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Key" +msgstr "Gakoa" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Internet connection" +msgstr "Interneteko konexioa" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Eavesdropping" +msgstr "Eragotzi" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Data sharing" +msgstr "Datu partekatzea"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 09 Oct '14

09 Oct '14

commit aa5883585d73598434bb41f67d59350ccbf02c0f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 9 11:16:20 2014 +0000 Update translations for tor-and-https --- eu.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/eu.po b/eu.po index 19286d4..2098fbb 100644 --- a/eu.po +++ b/eu.po @@ -1,12 +1,13 @@ # # Translators: -# Egoitz Rodriguez Obieta <egoitzro2(a)hotmail.com>, 2014 +# Egoitz Rodriguez Obieta <egoitzro(a)gmail.com>, 2014 +# Egoitz Rodriguez Obieta <egoitzro(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2014-09-20 16:30+0000\n" -"Last-Translator: Egoitz Rodriguez Obieta <egoitzro2(a)hotmail.com>\n" +"PO-Revision-Date: 2014-10-09 10:50+0000\n" +"Last-Translator: Egoitz Rodriguez Obieta <egoitzro(a)gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "" +msgstr "ltr" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 @@ -33,7 +34,7 @@ msgstr "Tor eta HTTPS" #: C/tor-and-https.svg:363 #, no-wrap msgid "Site.com" -msgstr "" +msgstr "Site.com" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". @@ -102,14 +103,14 @@ msgstr "Polizia" #: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" -msgstr "" +msgstr "NSA" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. #: C/tor-and-https.svg:363 #, no-wrap msgid "Tor relay" -msgstr "" +msgstr "Tor erreleboan" #. (itstool) path: defs/text #: C/tor-and-https.svg:363 @@ -127,7 +128,7 @@ msgstr "Interneteko konexioa" #: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" -msgstr "" +msgstr "Eragotzi" #. (itstool) path: defs/text #: C/tor-and-https.svg:363

1 0