April 2019 - tor-commits - lists.torproject.org

[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit dd797c01c40e12ab4ea342d4b23fca7b9aef6c06 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 18:20:15 2019 +0000 Update translations for torbutton-browseronboardingproperties_completed --- ka/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties index 7ab60d487..f9f4e9893 100644 --- a/ka/browserOnboarding.properties +++ b/ka/browserOnboarding.properties @@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=იხილეთ უსაფ onboarding.tour-tor-security=უსაფრთხოება onboarding.tour-tor-security.title=მოარგეთ საკუთარ მოთხოვნილებებს onboarding.tour-tor-security.description=ჩვენ ასევე გთავაზობთ დამატებით პარამეტრებს, ბრაუზერის უსაფრთხოების კიდევ უფრო მეტად ასამაღლებლად. ჩვენი უსაფრთხოების პარამეტრები, საშუალებას გაძლევთ შეზღუდოთ გვერდის ის ნაწილები, რომლებიც თქვენს კომპიუტერზე შეტევისთვის შეიძლება გამოიყენონ. დაწკაპეთ ქვემოთ და იხილეთ ამ პარამეტრების შესახებ ვრცლად. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +onboarding.tour-tor-security.description-suffix=გაითვალისწინეთ: ნაგულისხმევად, NoScript და HTTPS Everywhere არაა წარმოდგენილი ხელსაწყოთა ზოლზე, თუმცა სურვილისამებრ, შეგიძლიათ მათი მანდ განთავსება. onboarding.tour-tor-security-level.button=უსაფრთხოების დონის ნახვა onboarding.tour-tor-security-level.next-button=იხილეთ გამოყენების რჩევები

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 7eddb8a1727fd1734a928d5d2f3db86b2f43f4f4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 18:20:07 2019 +0000 Update translations for torbutton-browseronboardingproperties --- ka/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties index 7ab60d487..f9f4e9893 100644 --- a/ka/browserOnboarding.properties +++ b/ka/browserOnboarding.properties @@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=იხილეთ უსაფ onboarding.tour-tor-security=უსაფრთხოება onboarding.tour-tor-security.title=მოარგეთ საკუთარ მოთხოვნილებებს onboarding.tour-tor-security.description=ჩვენ ასევე გთავაზობთ დამატებით პარამეტრებს, ბრაუზერის უსაფრთხოების კიდევ უფრო მეტად ასამაღლებლად. ჩვენი უსაფრთხოების პარამეტრები, საშუალებას გაძლევთ შეზღუდოთ გვერდის ის ნაწილები, რომლებიც თქვენს კომპიუტერზე შეტევისთვის შეიძლება გამოიყენონ. დაწკაპეთ ქვემოთ და იხილეთ ამ პარამეტრების შესახებ ვრცლად. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +onboarding.tour-tor-security.description-suffix=გაითვალისწინეთ: ნაგულისხმევად, NoScript და HTTPS Everywhere არაა წარმოდგენილი ხელსაწყოთა ზოლზე, თუმცა სურვილისამებრ, შეგიძლიათ მათი მანდ განთავსება. onboarding.tour-tor-security-level.button=უსაფრთხოების დონის ნახვა onboarding.tour-tor-security-level.next-button=იხილეთ გამოყენების რჩევები

1 0

[stem/master] Start using the cryptography package for verifying Ed25519 signatures
by atagar＠torproject.org 10 Apr '19

10 Apr '19

commit f58577435c91b56f9381f07cb6486a17f9b7ad9a Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Wed Apr 10 00:23:34 2019 +0300 Start using the cryptography package for verifying Ed25519 signatures --- docs/faq.rst | 4 +--- requirements.txt | 1 - run_tests.py | 1 - stem/descriptor/certificate.py | 29 ++++++++++++++--------------- stem/descriptor/server_descriptor.py | 2 +- stem/prereq.py | 26 ++++++++++++++------------ test/require.py | 3 +-- test/settings.cfg | 2 -- test/task.py | 2 -- test/unit/descriptor/certificate.py | 6 +++--- 10 files changed, 34 insertions(+), 42 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 23d0c3f1..ceaeaf78 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -53,8 +53,7 @@ Does Stem have any dependencies? **No.** All you need in order to use Stem is Python. When it is available Stem will use `cryptography -<https://pypi.python.org/pypi/cryptography>`_ and `PyNaCl -<https://pypi.python.org/pypi/PyNaCl/>`_ to validate descriptor signatures. +<https://pypi.python.org/pypi/cryptography>`_ to validate descriptor signatures. However, there is no need to install cryptography unless you need this functionality. @@ -81,7 +80,6 @@ Ubuntu you can install these with... % sudo apt-get install python-dev libffi-dev % sudo pip install cryptography - % sudo pip install pynacl .. _what_python_versions_is_stem_compatible_with: diff --git a/requirements.txt b/requirements.txt index 3cd71608..6dc054ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,3 @@ pyflakes pycodestyle tox cryptography -pynacl diff --git a/run_tests.py b/run_tests.py index e8dd1a82..c31e7b48 100755 --- a/run_tests.py +++ b/run_tests.py @@ -163,7 +163,6 @@ def main(): test.task.PYTHON_VERSION, test.task.PLATFORM_VERSION, test.task.CRYPTO_VERSION, - test.task.PYNACL_VERSION, test.task.MOCK_VERSION, test.task.PYFLAKES_VERSION, test.task.PYCODESTYLE_VERSION, diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index 37829bc4..2f62e889 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -224,34 +224,33 @@ class Ed25519CertificateV1(Ed25519Certificate): :raises: * **ValueError** if signing key or descriptor are invalid - * **ImportError** if pynacl module is unavailable + * **ImportError** if cryptography module is unavailable or ed25519 is not supported """ - if not stem.prereq._is_pynacl_available(): - raise ImportError('Certificate validation requires the pynacl module') + if not stem.prereq._is_crypto_ed25519_supported(): + raise ImportError('Certificate validation requires the cryptography module and support of ed25519') - import nacl.signing - import nacl.encoding - from nacl.exceptions import BadSignatureError + from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey + from cryptography.exceptions import InvalidSignature descriptor_content = server_descriptor.get_bytes() signing_key = None if server_descriptor.ed25519_master_key: - signing_key = nacl.signing.VerifyKey(stem.util.str_tools._to_bytes(server_descriptor.ed25519_master_key) + b'=', encoder = nacl.encoding.Base64Encoder) + signing_key = Ed25519PublicKey.from_public_bytes(base64.b64decode(stem.util.str_tools._to_bytes(server_descriptor.ed25519_master_key) + b'=')) else: for extension in self.extensions: if extension.type == ExtensionType.HAS_SIGNING_KEY: - signing_key = nacl.signing.VerifyKey(extension.data) + signing_key = Ed25519PublicKey.from_public_bytes(extension.data) break if not signing_key: raise ValueError('Server descriptor missing an ed25519 signing key') try: - signing_key.verify(base64.b64decode(stem.util.str_tools._to_bytes(self.encoded))[:-ED25519_SIGNATURE_LENGTH], self.signature) - except BadSignatureError as exc: - raise ValueError('Ed25519KeyCertificate signing key is invalid (%s)' % exc) + signing_key.verify(self.signature, base64.b64decode(stem.util.str_tools._to_bytes(self.encoded))[:-ED25519_SIGNATURE_LENGTH]) + except InvalidSignature: + raise ValueError('Ed25519KeyCertificate signing key is invalid (Signature was forged or corrupt)') # ed25519 signature validates descriptor content up until the signature itself @@ -265,7 +264,7 @@ class Ed25519CertificateV1(Ed25519Certificate): signature_bytes = base64.b64decode(stem.util.str_tools._to_bytes(server_descriptor.ed25519_signature) + b'=' * missing_padding) try: - verify_key = nacl.signing.VerifyKey(self.key) - verify_key.verify(descriptor_sha256_digest, signature_bytes) - except BadSignatureError as exc: - raise ValueError('Descriptor Ed25519 certificate signature invalid (%s)' % exc) + verify_key = Ed25519PublicKey.from_public_bytes(self.key) + verify_key.verify(signature_bytes, descriptor_sha256_digest) + except InvalidSignature: + raise ValueError('Descriptor Ed25519 certificate signature invalid (Signature was forged or corrupt)') diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 6cc0e775..fc03a711 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -865,7 +865,7 @@ class RelayDescriptor(ServerDescriptor): if onion_key_crosscert_digest != self._onion_key_crosscert_digest(): raise ValueError('Decrypted onion-key-crosscert digest does not match local digest (calculated: %s, local: %s)' % (onion_key_crosscert_digest, self._onion_key_crosscert_digest())) - if stem.prereq._is_pynacl_available() and self.certificate: + if stem.prereq._is_crypto_ed25519_supported() and self.certificate: self.certificate.validate(self) @classmethod diff --git a/stem/prereq.py b/stem/prereq.py index 594e4239..c2b546dc 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -29,7 +29,7 @@ import sys CRYPTO_UNAVAILABLE = "Unable to import the cryptography module. Because of this we'll be unable to verify descriptor signature integrity. You can get cryptography from: https://pypi.python.org/pypi/cryptography" ZSTD_UNAVAILABLE = 'ZSTD compression requires the zstandard module (https://pypi.python.org/pypi/zstandard)' LZMA_UNAVAILABLE = 'LZMA compression requires the lzma module (https://docs.python.org/3/library/lzma.html)' -PYNACL_UNAVAILABLE = "Unable to import the pynacl module. Because of this we'll be unable to verify descriptor ed25519 certificate integrity. You can get pynacl from https://pypi.python.org/pypi/PyNaCl/" +ED25519_UNSUPPORTED = "Unable to verify descriptor ed25519 certificate integrity. ed25519 is not supported by installed versions of OpenSSL and/or cryptography" def check_requirements(): @@ -126,6 +126,7 @@ def is_crypto_available(): try: from cryptography.utils import int_from_bytes, int_to_bytes from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.backends.openssl.backend import backend from cryptography.hazmat.primitives.asymmetric import rsa from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.primitives.serialization import load_der_public_key @@ -239,20 +240,21 @@ def _is_lru_cache_available(): return hasattr(functools, 'lru_cache') -def _is_pynacl_available(): +def _is_crypto_ed25519_supported(): """ - Checks if the pynacl functions we use are available. This is used for - verifying ed25519 certificates in relay descriptor signatures. + Checks if ed25519 is supported by current versions of the cryptography + package and OpenSSL. This is used for verifying ed25519 certificates in relay + descriptor signatures. - :returns: **True** if we can use pynacl and **False** otherwise + :returns: **True** if ed25519 is supported and **False** otherwise """ - from stem.util import log - try: - from nacl import encoding - from nacl import signing - return True - except ImportError: - log.log_once('stem.prereq._is_pynacl_available', log.INFO, PYNACL_UNAVAILABLE) + if not is_crypto_available(): return False + + from cryptography.hazmat.backends.openssl.backend import backend + supported = hasattr(backend, 'ed25519_supported') and backend.ed25519_supported() + if not supported: + log.log_once('stem.prereq._is_crypto_ed25519_supported', log.INFO, ED25519_UNSUPPORTED) + return supported diff --git a/test/require.py b/test/require.py index e6a0bbcc..1117ea1e 100644 --- a/test/require.py +++ b/test/require.py @@ -12,7 +12,6 @@ run. |- needs - skips the test unless a requirement is met | |- cryptography - skips test unless the cryptography module is present - |- pynacl - skips test unless the pynacl module is present |- command - requires a command to be on the path |- proc - requires the platform to have recognized /proc contents | @@ -99,7 +98,7 @@ def version(req_version): cryptography = needs(stem.prereq.is_crypto_available, 'requires cryptography') -pynacl = needs(stem.prereq._is_pynacl_available, 'requires pynacl module') +ed25519_support = needs(stem.prereq._is_crypto_ed25519_supported, 'requires ed25519 support') proc = needs(stem.util.proc.is_available, 'proc unavailable') controller = needs(_can_access_controller, 'no connection') ptrace = needs(_can_ptrace, 'DisableDebuggerAttachment is set') diff --git a/test/settings.cfg b/test/settings.cfg index d463cac9..6bdf9394 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -177,8 +177,6 @@ pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.modes' pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.Cipher' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.algorithms' imported but unused pyflakes.ignore stem/prereq.py => 'lzma' imported but unused -pyflakes.ignore stem/prereq.py => 'nacl.encoding' imported but unused -pyflakes.ignore stem/prereq.py => 'nacl.signing' imported but unused pyflakes.ignore stem/response/events.py => undefined name 'long' pyflakes.ignore stem/util/__init__.py => undefined name 'long' pyflakes.ignore stem/util/__init__.py => undefined name 'unicode' diff --git a/test/task.py b/test/task.py index c527a0c7..7b75aa47 100644 --- a/test/task.py +++ b/test/task.py @@ -14,7 +14,6 @@ |- PYTHON_VERSION - checks our python version |- PLATFORM_VERSION - checks our operating system version |- CRYPTO_VERSION - checks our version of cryptography - |- PYNACL_VERSION - checks our version of pynacl |- MOCK_VERSION - checks our version of mock |- PYFLAKES_VERSION - checks our version of pyflakes |- PYCODESTYLE_VERSION - checks our version of pycodestyle @@ -313,7 +312,6 @@ TOR_VERSION = Task('tor version', _check_tor_version) PYTHON_VERSION = Task('python version', _check_python_version) PLATFORM_VERSION = Task('operating system', _check_platform_version) CRYPTO_VERSION = ModuleVersion('cryptography version', 'cryptography', stem.prereq.is_crypto_available) -PYNACL_VERSION = ModuleVersion('pynacl version', 'nacl', stem.prereq._is_pynacl_available) MOCK_VERSION = ModuleVersion('mock version', ['unittest.mock', 'mock'], stem.prereq.is_mock_available) PYFLAKES_VERSION = ModuleVersion('pyflakes version', 'pyflakes') PYCODESTYLE_VERSION = ModuleVersion('pycodestyle version', ['pycodestyle', 'pep8']) diff --git a/test/unit/descriptor/certificate.py b/test/unit/descriptor/certificate.py index 28e0d20b..ca0a626e 100644 --- a/test/unit/descriptor/certificate.py +++ b/test/unit/descriptor/certificate.py @@ -157,7 +157,7 @@ class TestEd25519Certificate(unittest.TestCase): exc_msg = 'Ed25519 HAS_SIGNING_KEY extension must be 32 bytes, but was 2.' self.assertRaisesWith(ValueError, exc_msg, Ed25519Certificate.parse, certificate(extension_data = [b'\x00\x02\x04\x07\11\12'])) - @test.require.pynacl + @test.require.ed25519_support def test_validation_with_descriptor_key(self): """ Validate a descriptor signature using the ed25519 master key within the @@ -169,7 +169,7 @@ class TestEd25519Certificate(unittest.TestCase): desc.certificate.validate(desc) - @test.require.pynacl + @test.require.ed25519_support def test_validation_with_embedded_key(self): """ Validate a descriptor signature using the signing key within the ed25519 @@ -182,7 +182,7 @@ class TestEd25519Certificate(unittest.TestCase): desc.ed25519_master_key = None desc.certificate.validate(desc) - @test.require.pynacl + @test.require.ed25519_support def test_validation_with_invalid_descriptor(self): """ Validate a descriptor without a valid signature.

1 0

[stem/master] Note ed25519 improvement in the changelog
by atagar＠torproject.org 10 Apr '19

10 Apr '19

commit f8c830205feaf0868ab3d563abe79e1aafcf4604 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 10 10:59:49 2019 -0700 Note ed25519 improvement in the changelog Yikes. Illia's patch is phenominal, really the only really worth adding is the changelog entry. --- docs/change_log.rst | 1 + stem/descriptor/certificate.py | 5 +++-- stem/prereq.py | 12 +++++++----- test/settings.cfg | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index f188c885..c647c001 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 * **Descriptors** * `Bandwidth file support <api/descriptor/bandwidth_file.html>`_ (:trac:`29056`) + * Ed25519 validity checks are now done though the cryptography module rather than PyNaCl (:trac:`22022`) * Download compressed descriptors by default (:trac:`29186`) * Added :func:`stem.descriptor.remote.get_microdescriptors` * Added :class:`~stem.descriptor.networkstatus.DetachedSignature` parsing (:trac:`28495`) diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index 2f62e889..449e106c 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -224,11 +224,12 @@ class Ed25519CertificateV1(Ed25519Certificate): :raises: * **ValueError** if signing key or descriptor are invalid - * **ImportError** if cryptography module is unavailable or ed25519 is not supported + * **ImportError** if cryptography module is unavailable or ed25519 is + unsupported """ if not stem.prereq._is_crypto_ed25519_supported(): - raise ImportError('Certificate validation requires the cryptography module and support of ed25519') + raise ImportError('Certificate validation requires the cryptography module and ed25519 support') from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey from cryptography.exceptions import InvalidSignature diff --git a/stem/prereq.py b/stem/prereq.py index c2b546dc..1e4450c7 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -29,7 +29,7 @@ import sys CRYPTO_UNAVAILABLE = "Unable to import the cryptography module. Because of this we'll be unable to verify descriptor signature integrity. You can get cryptography from: https://pypi.python.org/pypi/cryptography" ZSTD_UNAVAILABLE = 'ZSTD compression requires the zstandard module (https://pypi.python.org/pypi/zstandard)' LZMA_UNAVAILABLE = 'LZMA compression requires the lzma module (https://docs.python.org/3/library/lzma.html)' -ED25519_UNSUPPORTED = "Unable to verify descriptor ed25519 certificate integrity. ed25519 is not supported by installed versions of OpenSSL and/or cryptography" +ED25519_UNSUPPORTED = 'Unable to verify descriptor ed25519 certificate integrity. ed25519 is not supported by installed versions of OpenSSL and/or cryptography' def check_requirements(): @@ -248,13 +248,15 @@ def _is_crypto_ed25519_supported(): :returns: **True** if ed25519 is supported and **False** otherwise """ - from stem.util import log if not is_crypto_available(): return False + from stem.util import log from cryptography.hazmat.backends.openssl.backend import backend - supported = hasattr(backend, 'ed25519_supported') and backend.ed25519_supported() - if not supported: + + if hasattr(backend, 'ed25519_supported') and backend.ed25519_supported(): + return True + else: log.log_once('stem.prereq._is_crypto_ed25519_supported', log.INFO, ED25519_UNSUPPORTED) - return supported + return False diff --git a/test/settings.cfg b/test/settings.cfg index 6bdf9394..944428e2 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -172,6 +172,7 @@ pyflakes.ignore stem/prereq.py => 'sqlite3' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.utils.int_to_bytes' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.utils.int_from_bytes' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.backends.default_backend' imported but unused +pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.backends.openssl.backend.backend' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.serialization.load_der_public_key' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.modes' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.Cipher' imported but unused

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 8d9d434a6c5e3e9fc9a46e9186017b0d3b47ac5c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 17:51:42 2019 +0000 Update translations for support-portal --- contents+ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index d61e7dccc..6e952aa9d 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -3,8 +3,8 @@ # Isho Antar <isho.antar1(a)gmail.com>, 2018 # erinm, 2019 # Ahmed A. <6622227a(a)gmail.com>, 2019 -# ButterflyOfFire ButterflyOfFire, 2019 # Emma Peel, 2019 +# ButterflyOfFire ButterflyOfFire, 2019 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-08 17:07+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: ButterflyOfFire ButterflyOfFire, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #: https//support.torproject.org/ (content/contents+en.lrshowcase.title) msgid "How can we help?" -msgstr "" +msgstr "كيف يمكننا مساعدتك؟" #: https//support.torproject.org/faq/ (content/faq/contents+en.lrtopic.title) msgid "Most Frequently Asked Questions"

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 4b4532b024aca23c9c5c485bf9570d5c61b789ee Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 17:51:18 2019 +0000 Update translations for tpo-web --- contents+ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index e8f026f88..923e92362 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -29,7 +29,7 @@ msgstr "الرئيسية" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "######ABOUT US######" -msgstr "" +msgstr "######عنّا######" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "" @@ -176,7 +176,7 @@ msgstr "التأريخ" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.title) msgid "Download Tor Browser Alpha" -msgstr "" +msgstr "قم بتنزيل متصفح تور التجريبي" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.body) @@ -391,7 +391,7 @@ msgstr "" #: https//www.torproject.org/about/people/ #: (content/about/people/contents+en.lrpeople.title) msgid "People" -msgstr "" +msgstr "الأشخاص" #: https//www.torproject.org/about/people/ #: (content/about/people/contents+en.lrpeople.body)

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 7fa742ed71bc5ee70c0e4b38530d0b86638bebbf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 17:20:49 2019 +0000 Update translations for tpo-web --- contents+ar.po | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 5f2e8f2ed..e8f026f88 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1,9 +1,9 @@ # Translators: # Martus Translations <translations(a)martus.org>, 2019 # erinm, 2019 -# ButterflyOfFire ButterflyOfFire, 2019 # Ahmed A. <6622227a(a)gmail.com>, 2019 # Emma Peel, 2019 +# ButterflyOfFire ButterflyOfFire, 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-06 10:26+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: ButterflyOfFire ButterflyOfFire, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,6 +64,8 @@ msgid "" "<h4 class=\"text-primary\">Get Support <span class=\"oi oi-arrow-right p-1\"" " title=\"icon arrow-right\" aria-hidden=\"true\"></span></h4>" msgstr "" +"<h4 class=\"text-primary\">للحصول على المساعدة <span class=\"oi oi-arrow-" +"right p-1\" title=\"icon arrow-right\" aria-hidden=\"true\"></span></h4>" #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.body) @@ -122,7 +124,7 @@ msgstr "الدعم" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Jobs" -msgstr "" +msgstr "مناصب شغل" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Donate" @@ -134,7 +136,7 @@ msgstr "التقارير" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Sponsors" -msgstr "" +msgstr "الرعاة" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) @@ -195,7 +197,7 @@ msgstr "" #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.title) msgid "Download Tor Browser in your language" -msgstr "" +msgstr "تنزيل متصفح تور بلغتك" #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.body) @@ -444,7 +446,7 @@ msgstr "" #: templates/contact.html:8 msgid "Chat with us on" -msgstr "" +msgstr "تحدث معنا عبر" #: templates/contact.html:9 msgid "Ask questions about using Tor." @@ -560,7 +562,7 @@ msgstr "" #: templates/download-android.html:19 msgid "Go to Google Play" -msgstr "" +msgstr "انتقل إلى متجر غوغل للتطبيقات" #: templates/download-android.html:21 #, python-format @@ -601,7 +603,7 @@ msgstr "" #: templates/download.html:14 msgid "Support Portal" -msgstr "" +msgstr "بوابة الدعم" #: templates/download.html:14 msgid "Read other FAQ's at our Support Portal" @@ -687,7 +689,7 @@ msgstr "" #: templates/hero-download.html:2 msgid "Defend yourself." -msgstr "" +msgstr "دافع عن نفسك." #: templates/hero-download.html:38 msgid "Download in another language" @@ -695,7 +697,7 @@ msgstr "" #: templates/hero-download.html:39 msgid "Advanced Install Options" -msgstr "" +msgstr "الخيارات المتقدمة للتثبيت" #: templates/hero-download.html:42 msgid "Download Source Tarball" @@ -837,7 +839,7 @@ msgstr "" #: templates/people.html:28 msgid "Join Our Team" -msgstr "" +msgstr "انظم إلى فريقنا" #: templates/people.html:29 msgid "" @@ -852,7 +854,7 @@ msgstr "" #: templates/press.html:7 msgid "Get support" -msgstr "" +msgstr "الحصول على دعم" #: templates/press.html:9 msgid "Visit our Support Portal" @@ -884,7 +886,7 @@ msgstr "" #: templates/press.html:54 msgid "Coverage" -msgstr "" +msgstr "التغطية" #: templates/press.html:61 msgid "Date" @@ -974,7 +976,7 @@ msgstr "" #: templates/macros/jobs.html:11 msgid "Read more." -msgstr "" +msgstr "اقرأ المزيد." #: templates/macros/reports.html:5 templates/macros/reports.html:19 msgid "View PDF"

1 0

[tor/maint-0.4.0] Bump version to 0.4.0.4-rc
by nickm＠torproject.org 10 Apr '19

10 Apr '19

commit b2fc57426c29f28ade658c642cd692c022d88b42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 10 11:51:49 2019 -0400 Bump version to 0.4.0.4-rc --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3304b5cab..dc8fa7086 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.3-alpha-dev]) +AC_INIT([tor],[0.4.0.4-rc]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-23"], # for 0.4.0.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 0d0d4f493..4100b4619 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.3-alpha-dev" +!define VERSION "0.4.0.4-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d3441610b..09d38cb1e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.3-alpha-dev" +#define VERSION "0.4.0.4-rc"

1 0

[tor/master] Bump version to 0.4.0.4-rc
by nickm＠torproject.org 10 Apr '19

10 Apr '19

commit b2fc57426c29f28ade658c642cd692c022d88b42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 10 11:51:49 2019 -0400 Bump version to 0.4.0.4-rc --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3304b5cab..dc8fa7086 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.3-alpha-dev]) +AC_INIT([tor],[0.4.0.4-rc]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-23"], # for 0.4.0.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 0d0d4f493..4100b4619 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.3-alpha-dev" +!define VERSION "0.4.0.4-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d3441610b..09d38cb1e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.3-alpha-dev" +#define VERSION "0.4.0.4-rc"

1 0

[tor/release-0.4.0] Bump version to 0.4.0.4-rc
by nickm＠torproject.org 10 Apr '19

10 Apr '19

commit b2fc57426c29f28ade658c642cd692c022d88b42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 10 11:51:49 2019 -0400 Bump version to 0.4.0.4-rc --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3304b5cab..dc8fa7086 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.3-alpha-dev]) +AC_INIT([tor],[0.4.0.4-rc]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-23"], # for 0.4.0.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 0d0d4f493..4100b4619 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.3-alpha-dev" +!define VERSION "0.4.0.4-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d3441610b..09d38cb1e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.3-alpha-dev" +#define VERSION "0.4.0.4-rc"

1 0