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

[stem/master] Replace microdescriptor router status entry digest attribute
by atagar＠torproject.org 21 Nov '18

21 Nov '18

commit e30b130482be258245a4a28774959ecb2def58ed Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 21 10:42:20 2018 -0800 Replace microdescriptor router status entry digest attribute Bah. Back when I added our 'digest' attribute to RouterStatusEntryMicroV3 I tried to be consistent by making all our hashes hex. However, this was a mistake. Uses of the microdescriptor digest expect base64 so deprecating the 'digest' attribute with another 'microdescriptor_digest' that's base64. --- docs/change_log.rst | 1 + stem/descriptor/router_status_entry.py | 12 +++++++++++- test/unit/descriptor/router_status_entry.py | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index e99e933f..7b99f8f0 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -56,6 +56,7 @@ The following are only available within Stem's `git repository * Added the **hash_type** and **encoding** arguments to `ServerDescriptor <api/descriptor/server_descriptor.html#stem.descriptor.server_descriptor.ServerDescriptor.digest>`_ and `ExtraInfo's <api/descriptor/extrainfo_descriptor.html#stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor.digest>`_ digest methods (:trac:`28398`) * Added the network status vote's new bandwidth_file_digest attribute (:spec:`1b686ef`) * Added :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_valid` and :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_fresh` methods (:trac:`28448`) + * Replaced :func:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` hex encoded **digest** attribute with a base64 encoded **microdescriptor_digest** * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`) * Don't download from Serge, a bridge authority that frequently timeout diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index b4cd506a..7e88c89a 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -342,6 +342,10 @@ def _parse_microdescriptor_m_line(descriptor, entries): # "m" digest # example: m aiUklwBrua82obG5AsTX+iEpkjQA2+AQHxZ7GwMfY70 + descriptor.microdescriptor_digest = _value('m', entries) + + # TODO: drop the following in stem 2.x + descriptor.digest = _base64_to_hex(_value('m', entries), check_if_fingerprint = False) @@ -672,7 +676,9 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): information that isn't yet recognized :var dict protocols: mapping of protocols to their supported versions - :var str digest: **\*** router's hex encoded digest of our corresponding microdescriptor + :var str digest: **\*** router's hex encoded digest of our corresponding + microdescriptor (**deprecated**, use microdescriptor_digest instead) + :var str microdescriptor_digest: **\*** router's base64 encoded digest of our corresponding microdescriptor .. versionchanged:: 1.6.0 Added the protocols attribute. @@ -680,6 +686,9 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): .. versionchanged:: 1.7.0 Added the or_addresses attribute. + .. versionchanged:: 1.7.0 + Added the microdescriptor_digest attribute to replace our now deprecated digest attribute. + **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined """ @@ -692,6 +701,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): 'unrecognized_bandwidth_entries': ([], _parse_w_line), 'protocols': ({}, _parse_pr_line), + 'microdescriptor_digest': (None, _parse_microdescriptor_m_line), 'digest': (None, _parse_microdescriptor_m_line), }) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 9d8bf8ac..05b4dee6 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -163,6 +163,7 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual(expected_flags, set(entry.flags)) self.assertEqual(None, entry.version_line) self.assertEqual(None, entry.version) + self.assertEqual('aiUklwBrua82obG5AsTX+iEpkjQA2+AQHxZ7GwMfY70', entry.microdescriptor_digest) self.assertEqual('6A252497006BB9AF36A1B1B902C4D7FA2129923400DBE0101F167B1B031F63BD', entry.digest) self.assertEqual([], entry.get_unrecognized_lines())

1 0

[stem/master] Implement RouterStatusEntry.from_str()
by atagar＠torproject.org 21 Nov '18

21 Nov '18

commit 310b5ca40b24231a0721117cfb35952b9035dcde Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 21 11:36:07 2018 -0800 Implement RouterStatusEntry.from_str() Router status entries don't have their own @type annotation, so our from_str() method could not provide them. Implementing their own from_str() method so things like RouterStatusEntryV3.from_str() will work. --- stem/descriptor/router_status_entry.py | 22 ++++++++++++++++++++++ test/unit/descriptor/router_status_entry.py | 14 ++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 7e88c89a..b3334620 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -21,6 +21,7 @@ sources... import base64 import binascii +import io import stem.exit_policy import stem.prereq @@ -428,6 +429,27 @@ class RouterStatusEntry(Descriptor): 'v': _parse_v_line, } + @classmethod + def from_str(cls, content, **kwargs): + # Router status entries don't have their own @type annotation, so to make + # our subclass from_str() work we need to do the type inferencing ourself. + + if cls == RouterStatusEntry: + raise NotImplementedError('Please use the from_str() method from RouterStatusEntry subclasses, not RouterStatusEntry itself') + elif 'descriptor_type' in kwargs: + raise ValueError("Router status entries don't have their own @type annotation. As such providing a 'descriptor_type' argument with RouterStatusEntry.from_str() does not work. Please drop the 'descriptor_type' argument when using this these subclasses' from_str() method.") + + is_multiple = kwargs.pop('multiple', False) + validate = kwargs.pop('validate', False) + results = list(_parse_file(io.BytesIO(stem.util.str_tools._to_bytes(content)), validate, cls, **kwargs)) + + if is_multiple: + return results + elif len(results) == 1: + return results[0] + else: + raise ValueError("Descriptor.from_str() expected a single descriptor, but had %i instead. Please include 'multiple = True' if you want a list of results instead." % len(results)) + def __init__(self, content, validate = False, document = None): """ Parse a router descriptor in a network status document. diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 05b4dee6..c428d6b2 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -20,6 +20,7 @@ from test.unit.descriptor import ( ) from stem.descriptor.router_status_entry import ( + RouterStatusEntry, RouterStatusEntryV2, RouterStatusEntryV3, RouterStatusEntryMicroV3, @@ -83,6 +84,19 @@ def vote_document(): class TestRouterStatusEntry(unittest.TestCase): + def test_from_str(self): + """ + Exercise our RouterStatusEntry.from_str(). + """ + + desc = RouterStatusEntryV3.create() + content = desc.get_bytes() + + self.assertEqual(desc, RouterStatusEntryV3.from_str(content)) + + self.assertRaisesWith(NotImplementedError, 'Please use the from_str() method from RouterStatusEntry subclasses, not RouterStatusEntry itself', RouterStatusEntry.from_str, content) + self.assertRaisesWith(ValueError, "Router status entries don't have their own @type annotation. As such providing a 'descriptor_type' argument with RouterStatusEntry.from_str() does not work. Please drop the 'descriptor_type' argument when using this these subclasses' from_str() method.", RouterStatusEntryV3.from_str, content, descriptor_type = 'network-status-consensus-3 1.0') + def test_fingerprint_decoding(self): """ Tests for the _base64_to_hex() helper.

1 0

[stem/master] Digest method for microdescriptors
by atagar＠torproject.org 21 Nov '18

21 Nov '18

commit 5495c5725ed492055fe888f6269ab062baa52e38 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 21 12:21:32 2018 -0800 Digest method for microdescriptors Revamp digesting of Microdescriptors in the same way as server and extrainfo descriptors... https://trac.torproject.org/projects/tor/ticket/28398 This is definitely better *but* is backward incompatible with the class' old 'digest' attribute. Unfortunately I can't avoid this. The method needs to be called digest() for consistency, and python cannot have name conflicts between methods and attributes. The old digest value was hex rather than base64 encoded which made it relatively useless (it couldn't be used to fetch or validate microdescriptors, the sole point of the damn thing) so fingers crossed that no one was using it. I try very hard to provide backward compatibility in minor version bumps of Stem but in this case I don't think we should be a slave to that here. --- docs/change_log.rst | 1 + stem/descriptor/microdescriptor.py | 42 ++++++++++++++++++++++++++------- test/unit/descriptor/microdescriptor.py | 1 + 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 396ec105..48311df4 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -58,6 +58,7 @@ The following are only available within Stem's `git repository * Added the network status vote's new bandwidth_file_digest attribute (:spec:`1b686ef`) * Added :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_valid` and :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_fresh` methods (:trac:`28448`) * Replaced :func:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` hex encoded **digest** attribute with a base64 encoded **microdescriptor_digest** + * Replaced the **digest** attribute of :class:`~stem.descriptor.microdescriptor.Microdescriptor` with a method by the same name (:trac:`28398`) * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`) * Don't download from Serge, a bridge authority that frequently timeout diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 74a01071..8672f039 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -71,6 +71,8 @@ import stem.prereq from stem.descriptor import ( Descriptor, + DigestHash, + DigestEncoding, _descriptor_content, _descriptor_components, _read_until_keywords, @@ -183,10 +185,6 @@ def _parse_id_line(descriptor, entries): descriptor.identifiers = identities -def _parse_digest(descriptor, entries): - setattr(descriptor, 'digest', hashlib.sha256(descriptor.get_bytes()).hexdigest().upper()) - - _parse_onion_key_line = _parse_key_block('onion-key', 'onion_key', 'RSA PUBLIC KEY') _parse_ntor_onion_key_line = _parse_simple_line('ntor-onion-key', 'ntor_onion_key') _parse_family_line = _parse_simple_line('family', 'family', func = lambda v: v.split(' ')) @@ -199,9 +197,6 @@ class Microdescriptor(Descriptor): Microdescriptor (`descriptor specification <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_) - :var str digest: **\*** hex digest for this microdescriptor, this can be used - to match against the corresponding digest attribute of a - :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` :var str onion_key: **\*** key used to encrypt EXTEND cells :var str ntor_onion_key: base64 key used to encrypt EXTEND in the ntor protocol :var list or_addresses: **\*** alternative for our address/or_port attributes, each @@ -231,6 +226,13 @@ class Microdescriptor(Descriptor): .. versionchanged:: 1.6.0 Added the protocols attribute. + + .. versionchanged:: 1.8.0 + Replaced our **digest** attribute with a much more flexible **digest()** + method. Unfortunately I cannot do this in a backward compatible way + because of the name conflict. The old digest had multiple problems (for + instance, being hex rather than base64 encoded), so hopefully no one was + using it. Very sorry if this causes trouble for anyone. """ TYPE_ANNOTATION_NAME = 'microdescriptor' @@ -246,7 +248,6 @@ class Microdescriptor(Descriptor): 'identifier': (None, _parse_id_line), # deprecated in favor of identifiers 'identifiers': ({}, _parse_id_line), 'protocols': ({}, _parse_pr_line), - 'digest': (None, _parse_digest), } PARSER_FOR_LINE = { @@ -275,12 +276,35 @@ class Microdescriptor(Descriptor): entries = _descriptor_components(raw_contents, validate) if validate: - self.digest = hashlib.sha256(self.get_bytes()).hexdigest().upper() self._parse(entries, validate) self._check_constraints(entries) else: self._entries = entries + def digest(self, hash_type = DigestHash.SHA256, encoding = DigestEncoding.BASE64): + """ + Digest of this microdescriptor. These are referenced by... + + * **Microdescriptor Consensus** + + * Referer: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` **digest** attribute + * Format: **SHA256/BASE64** + + .. versionadded:: 1.8.0 + + :param stem.descriptor.DigestHash hash_type: digest hashing algorithm + :param stem.descriptor.DigestEncoding encoding: digest encoding + + :returns: **hashlib.HASH** or **str** based on our encoding argument + """ + + if hash_type == DigestHash.SHA1: + return stem.descriptor._encode_digest(hashlib.sha1(self.get_bytes()), encoding) + elif hash_type == DigestHash.SHA256: + return stem.descriptor._encode_digest(hashlib.sha256(self.get_bytes()), encoding) + else: + raise NotImplementedError('Microdescriptor digests are only available in sha1 and sha256, not %s' % hash_type) + @lru_cache() def get_annotations(self): """ diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index bb4b91a2..2afccc48 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -74,6 +74,7 @@ class TestMicrodescriptor(unittest.TestCase): self.assertEqual({b'@last-listed': b'2013-02-24 00:18:36'}, router.get_annotations()) self.assertEqual([b'@last-listed 2013-02-24 00:18:36'], router.get_annotation_lines()) + self.assertEqual('uhCGfIM6RbeD1Z/C6e9ct41+NIl9EbpgP8wG7uZT2Rw', router.digest()) self.assertEqual('@type microdescriptor 1.0', str(router.type_annotation())) def test_minimal_microdescriptor(self):

1 0

[stem/master] Undeprecate stem.descriptor.remote's get_microdescriptors()
by atagar＠torproject.org 21 Nov '18

21 Nov '18

commit c606f44289408a63ea9ddfbe4dc3a18384b350cd Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 21 11:52:50 2018 -0800 Undeprecate stem.descriptor.remote's get_microdescriptors() We deprecated get_microdescriptors() because tor hadn't implemented it on DirPorts but now it has. Not only that but our existing method just works (neat!). Undeprecating get_microdescriptors(), expanding its pydocs, adding a test, and adding an alias to the base module to match other descriptor types. --- docs/change_log.rst | 1 + stem/descriptor/remote.py | 46 ++++++++++++++++++++++++++++++++++++---------- test/unit/doctest.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 10 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 7b99f8f0..396ec105 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -51,6 +51,7 @@ The following are only available within Stem's `git repository * **Descriptors** + * Added :func:`stem.descriptor.remote.get_microdescriptors` * Added :func:`~stem.descriptor.__init__.Descriptor.from_str` method (:trac:`28450`) * Added :func:`~stem.descriptor.__init__.Descriptor.type_annotation` method (:trac:`28397`) * Added the **hash_type** and **encoding** arguments to `ServerDescriptor <api/descriptor/server_descriptor.html#stem.descriptor.server_descriptor.ServerDescriptor.digest>`_ and `ExtraInfo's <api/descriptor/extrainfo_descriptor.html#stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor.digest>`_ digest methods (:trac:`28398`) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 91a3bad2..78dd8367 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -59,6 +59,7 @@ content. For example... |- their_server_descriptor - provides the server descriptor of the relay we download from |- get_server_descriptors - provides present server descriptors |- get_extrainfo_descriptors - provides present extrainfo descriptors + |- get_microdescriptors - provides present microdescriptors with the given digests |- get_consensus - provides the present consensus or router status entries |- get_key_certificates - provides present authority key certificates +- query - request an arbitrary descriptor resource @@ -191,6 +192,18 @@ def get_extrainfo_descriptors(fingerprints = None, **query_args): return get_instance().get_extrainfo_descriptors(fingerprints, **query_args) +def get_microdescriptors(hashes, **query_args): + """ + Shorthand for + :func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors` + on our singleton instance. + + .. versionadded:: 1.8.0 + """ + + return get_instance().get_microdescriptors(hashes, **query_args) + + def get_consensus(authority_v3ident = None, microdescriptor = False, **query_args): """ Shorthand for @@ -662,19 +675,32 @@ class DescriptorDownloader(object): return self.query(resource, **query_args) - # TODO: drop in stem 2.x - def get_microdescriptors(self, hashes, **query_args): """ Provides the microdescriptors with the given hashes. To get these see the - 'microdescriptor_hashes' attribute of - :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3`. Note - that these are only provided via a microdescriptor consensus (such as - 'cached-microdesc-consensus' in your data directory). - - .. deprecated:: 1.5.0 - This function has never worked, as it was never implemented in tor - (:trac:`9271`). + **microdescriptor_digest** attribute of + :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3`. + Note that these are only provided via the **microdescriptor consensus**. + For exampe... + + :: + + >>> import stem.descriptor.remote + >>> consensus = stem.descriptor.remote.get_consensus(microdescriptor = True).run() + >>> my_router_status_entry = filter(lambda desc: desc.nickname == 'caersidi', consensus)[0] + >>> print(my_router_status_entry.microdescriptor_digest) + IQI5X2A5p0WVN/MgwncqOaHF2f0HEGFEaxSON+uKRhU + + >>> my_microdescriptor = stem.descriptor.remote.get_microdescriptors([my_router_status_entry.microdescriptor_digest]).run()[0] + >>> print(my_microdescriptor) + onion-key + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJo9yyVgG8ksEHQibqPIEbLieI6rh1EACRPiDiV21YObb+9QEHaR3Cf + FNAzDbGhbvADLBB7EzuViL8w+eXQUOaIsJRdymh/wuUJ78bv5oEIJhthKq/Uqa4P + wKHXSZixwAHfy8NASTX3kxu9dAHWU3Owb+4W4lR2hYM0ZpoYYkThAgMBAAE= + -----END RSA PUBLIC KEY----- + ntor-onion-key kWOHNd+2uBlMpcIUbbpFLiq/rry66Ep6MlwmNpwzcBg= + id ed25519 xE/GeYImYAIB0RbzJXFL8kDLpDrj/ydCuCdvOgC4F/4 :param str,list hashes: microdescriptor hash or list of hashes to be retrieved diff --git a/test/unit/doctest.py b/test/unit/doctest.py index 7e40e873..28eef0cf 100644 --- a/test/unit/doctest.py +++ b/test/unit/doctest.py @@ -34,6 +34,26 @@ ADD_ONION_RESPONSE = """\ 250 OK """ +CONSENSUS_ENTRY = """\ +r caersidi O7NMYwctnRDoNu5ClocT97kyX2Y 2018-11-21 05:25:24 208.113.135.162 1443 1444 +m IQI5X2A5p0WVN/MgwncqOaHF2f0HEGFEaxSON+uKRhU +s Fast Guard HSDir Running Stable V2Dir Valid +v Tor 0.3.4.0-alpha-dev +pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 +w Bandwidth=8360 +""" + +MICRODESCRIPTOR_ENTRY = """\ +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAOJo9yyVgG8ksEHQibqPIEbLieI6rh1EACRPiDiV21YObb+9QEHaR3Cf +FNAzDbGhbvADLBB7EzuViL8w+eXQUOaIsJRdymh/wuUJ78bv5oEIJhthKq/Uqa4P +wKHXSZixwAHfy8NASTX3kxu9dAHWU3Owb+4W4lR2hYM0ZpoYYkThAgMBAAE= +-----END RSA PUBLIC KEY----- +ntor-onion-key kWOHNd+2uBlMpcIUbbpFLiq/rry66Ep6MlwmNpwzcBg= +id ed25519 xE/GeYImYAIB0RbzJXFL8kDLpDrj/ydCuCdvOgC4F/4 +""".rstrip() + class TestDocumentation(unittest.TestCase): def test_examples(self): @@ -51,6 +71,16 @@ class TestDocumentation(unittest.TestCase): get_config_mock.return_value = config test_run = doctest.testfile(path, **args) + elif path.endswith('/stem/descriptor/remote.py'): + consensus_query = Mock() + consensus_query.run.return_value = [stem.descriptor.router_status_entry.RouterStatusEntryMicroV3.from_str(CONSENSUS_ENTRY)] + + microdescriptor_query = Mock() + microdescriptor_query.run.return_value = [stem.descriptor.microdescriptor.Microdescriptor.from_str(MICRODESCRIPTOR_ENTRY)] + + with patch('stem.descriptor.remote.get_consensus', Mock(return_value = consensus_query)): + with patch('stem.descriptor.remote.get_microdescriptors', Mock(return_value = microdescriptor_query)): + test_run = doctest.testfile(path, **args) elif path.endswith('/stem/descriptor/router_status_entry.py'): args['globs'] = { '_base64_to_hex': stem.descriptor.router_status_entry._base64_to_hex,

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 85b1438cf5e6b8bd1c4f2c5ee317d241db645257 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 20:15:04 2018 +0000 Update translations for abouttor-homepage --- es/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index 671954b62..2bb31865c 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -38,10 +38,10 @@ <!ENTITY aboutTor.donationBanner.line2g "Apoya la libertad en internet"> <!ENTITY aboutTor.donationBanner.line2h "Defiende la web abierta"> <!ENTITY aboutTor.donationBanner.line2i "Apoya la privacidad y la libertad en línea."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla donará una cantidad idéntica a cada donación hasta 2019."> <!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualará tu donación."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> +<!ENTITY aboutTor.donationBanner.line3b "Dona ahora, y tu donación se duplicará."> <!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> <!ENTITY aboutTor.donationBanner.buttonB "Cuenta conmigo.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 314013e8a388c69705c027b604dd6a80f3de4f33 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 19:45:04 2018 +0000 Update translations for abouttor-homepage --- es/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index edc852448..671954b62 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -35,9 +35,9 @@ <!ENTITY aboutTor.donationBanner.line2d "Protege la privacidad de millones de personas."> <!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> <!ENTITY aboutTor.donationBanner.line2f "Necesitamos tu apoyo."> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2g "Apoya la libertad en internet"> +<!ENTITY aboutTor.donationBanner.line2h "Defiende la web abierta"> +<!ENTITY aboutTor.donationBanner.line2i "Apoya la privacidad y la libertad en línea."> <!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualará tu donación.">

1 0

[stem/master] Python3 unit test regressions with new Descriptor.from_str() tests
by atagar＠torproject.org 21 Nov '18

21 Nov '18

commit 2ea93474b863b4c63bff2652cc6c918c657211e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 21 09:29:16 2018 -0800 Python3 unit test regressions with new Descriptor.from_str() tests Oops, couple unicode-vs-bytes mistakes... https://trac.torproject.org/projects/tor/ticket/28550 ====================================================================== ERROR: test_from_str_multiple ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/descriptor/descriptor.py", line 45, in test_from_str_multiple RelayDescriptor.content({'router': 'relay2 71.35.133.197 9001 0 0'}), TypeError: sequence item 1: expected str instance, bytes found ====================================================================== ERROR: test_from_str_type_handling ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/descriptor/descriptor.py", line 33, in test_from_str_type_handling desc = Descriptor.from_str('@type server-descriptor 1.0\n' + desc_text) TypeError: Can't convert 'bytes' object to str implicitly ---------------------------------------------------------------------- I'm also making from_str() normalize unicode to bytes so the method isn't a misnomer for python3. --- stem/descriptor/__init__.py | 4 ++-- test/unit/descriptor/descriptor.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 17bea678..1b38783c 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -722,7 +722,7 @@ class Descriptor(object): .. versionadded:: 1.8.0 - :param bytes content: string to construct the descriptor from + :param str,bytes content: string to construct the descriptor from :param bool multiple: if provided with **True** this provides a list of descriptors rather than a single one :param dict kwargs: additional arguments for :func:`~stem.descriptor.__init__.parse_file` @@ -741,7 +741,7 @@ class Descriptor(object): kwargs['descriptor_type'] = str(TypeAnnotation(cls.TYPE_ANNOTATION_NAME, 1, 0))[6:] is_multiple = kwargs.pop('multiple', False) - results = list(parse_file(io.BytesIO(content), **kwargs)) + results = list(parse_file(io.BytesIO(stem.util.str_tools._to_bytes(content)), **kwargs)) if is_multiple: return results diff --git a/test/unit/descriptor/descriptor.py b/test/unit/descriptor/descriptor.py index cedb3832..9de70206 100644 --- a/test/unit/descriptor/descriptor.py +++ b/test/unit/descriptor/descriptor.py @@ -30,7 +30,7 @@ class TestDescriptor(unittest.TestCase): desc = Descriptor.from_str(desc_text, descriptor_type = 'server-descriptor 1.0') self.assertEqual('caerSidi', desc.nickname) - desc = Descriptor.from_str('@type server-descriptor 1.0\n' + desc_text) + desc = Descriptor.from_str(b'@type server-descriptor 1.0\n' + desc_text) self.assertEqual('caerSidi', desc.nickname) desc = RelayDescriptor.from_str(desc_text) @@ -39,8 +39,8 @@ class TestDescriptor(unittest.TestCase): self.assertRaisesWith(TypeError, "Unable to determine the descriptor's type. filename: '<undefined>', first line: 'router caerSidi 71.35.133.197 9001 0 0'", Descriptor.from_str, desc_text) def test_from_str_multiple(self): - desc_text = '\n'.join(( - '@type server-descriptor 1.0', + desc_text = b'\n'.join(( + b'@type server-descriptor 1.0', RelayDescriptor.content({'router': 'relay1 71.35.133.197 9001 0 0'}), RelayDescriptor.content({'router': 'relay2 71.35.133.197 9001 0 0'}), ))

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 47592ebd718f2f8c112e055aa12734f1d1e41001 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 16:49:17 2018 +0000 Update translations for whisperback --- sv/sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 8ab00cb40..c34bd0829 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-11-07 09:09+0000\n" +"PO-Revision-Date: 2018-11-21 16:28+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\nBuggrapporten kunde inte skickas, troligen på grund av nätverksproblem. Försök att ansluta till nätverket på nytt och klicka på skicka igen.\n\nOm det inte fungerar kommer du att få möjlighet att spara buggrapporten." +msgstr "\n\nFelrapporten kunde inte skickas, troligen på grund av nätverksproblem. Försök att ansluta till nätverket på nytt och klicka på skicka igen.\n\nOm det inte fungerar kommer du att få möjlighet att spara felrapporten." #: ../whisperBack/gui.py:222 msgid "Your message has been sent." @@ -124,7 +124,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Buggrapporten kunde inte skickas, troligen på grund av nätverksproblem.\n\nFör att komma runt problemet kan du spara buggrapporten som en fil på en USB-sticka och sedan försöka skicka den till oss på %s från ett e-post konto på ett annat system. Notera att din buggrapport då inte kommer vara anonym såvida du inte vidtar ytterligare åtgärder själv för att säkerställa detta (t.ex. använder Tor med ett tillfälligt e-post konto).\n\nVill du spara buggrapporten till en fil?" +msgstr "Felrapporten kunde inte skickas, troligen på grund av nätverksproblem.\n\nFör att komma runt problemet kan du spara felrapporten som en fil på en USB-sticka och sedan försöka skicka den till oss på %s från ett e-post konto på ett annat system. Notera att din felrapport då inte kommer vara anonym såvida du inte vidtar ytterligare åtgärder själv för att säkerställa detta (t.ex. använder Tor med ett tillfälligt e-postkonto).\n\nVill du spara felrapporten till en fil?" #: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -189,7 +189,7 @@ msgstr "Sammanfattning" #: ../data/whisperback.ui.h:23 msgid "Bug description" -msgstr "Buggbeskrivning" +msgstr "Felbeskrivning" #: ../data/whisperback.ui.h:24 msgid "Help:"

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 8fcb7fea5358d7171b9097eaea0763b4b4c55c7d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 16:49:01 2018 +0000 Update translations for tor-launcher-properties --- sv/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index 92800d733..406dfb9f1 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, en bugg i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har fixat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta. -torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. +torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, ett fel i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har åtgärdat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta. +torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina flikar i webbläsaren. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. torlauncher.tor_failed_to_start=Det gick inte att starta Tor.

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 4985d5224307c67994ad778321beee87333446ad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 16:48:52 2018 +0000 Update translations for torcheck --- sv/torcheck.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index 27ec75a3a..3755ab3b9 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-11-20 04:56+0000\n" +"PO-Revision-Date: 2018-11-21 16:34+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Besök <a href=\"https://www.torproject.org/\">Tor webbplatsen</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." +msgstr "Besök <a href=\"https://www.torproject.org/\">Tor-webbplatsen</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." msgid "There is a security update available for Tor Browser." msgstr "Det finns en tillgänglig säkerhets uppdatering för Tor Browser." @@ -80,19 +80,19 @@ msgid "" msgstr "Tor-projektet är en US 501(c)(3) non-profit organisation som utför forskning, utveckling, och utbildning inom anonymitet och integritet på nätet." msgid "Learn More »" -msgstr "Mer information »" +msgstr "Lär dig mer »" msgid "Go" msgstr "Byt" msgid "Short User Manual" -msgstr "Användarmanual" +msgstr "Kort användarmanual" msgid "Donate to Support Tor" msgstr "Donera till Tor" msgid "Tor Q&A Site" -msgstr "Frågor och svar" +msgstr "Webbplats för frågor och svar om Tor" msgid "Volunteer" msgstr "Hjälp till" @@ -107,7 +107,7 @@ msgid "However, it does not appear to be Tor Browser." msgstr "Dock verkar det inte vara Tor Browser." msgid "Run a Relay" -msgstr "Starta ett Relä" +msgstr "Starta en relä" msgid "Stay Anonymous" msgstr "Förbli anonym"

1 0