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

[stem/master] Migrate from pycrypto to cryptography module
by atagar＠torproject.org 26 Feb '17

26 Feb '17

commit 67252eb7e9ed54a2ed53bc20cc1dcac4dc82b15a Merge: c5cef00 1551fc5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 26 16:47:19 2017 -0800 Migrate from pycrypto to cryptography module Stem had an optional dependency on pycrypto to validate descriptor signatures but seems the module is no longer maintained... https://github.com/dlitz/pycrypto/issues/173 Moving to the cryptography module (https://cryptography.io/en/latest/) Thanks Patrick! docs/change_log.rst | 1 + docs/faq.rst | 22 +++++++++-- requirements.txt | 2 +- run_tests.py | 2 +- stem/descriptor/__init__.py | 20 +++++----- stem/descriptor/hidden_service_descriptor.py | 36 +++++++++--------- stem/descriptor/server_descriptor.py | 5 +++ stem/prereq.py | 18 +++++---- test/mocking.py | 46 ++++++++--------------- test/settings.cfg | 14 +++---- test/unit/descriptor/hidden_service_descriptor.py | 4 +- test/util.py | 4 +- 12 files changed, 92 insertions(+), 82 deletions(-)

1 0

[stem/master] Begin deprecating pycrypto with cryptography.
by atagar＠torproject.org 26 Feb '17

26 Feb '17

commit 11dae77ac5fbc2b8ee5c20b4b97fb253bbcb2998 Author: Patrick O'Doherty <p(a)trickod.com> Date: Sat Feb 25 16:35:28 2017 -0800 Begin deprecating pycrypto with cryptography. Refs: https://bugs.torproject.org/21086 Deprecate the usage of pycrypto in the descriptor _digest_for_signature function in favour of the cryptography[0] library. [0] - https://pypi.python.org/pypi/cryptography --- requirements.txt | 1 + stem/descriptor/__init__.py | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index ce5d201..5fb3d12 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ pyflakes pycodestyle pycrypto tox +cryptography diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 7c64293..5a6ec44 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -565,17 +565,16 @@ class Descriptor(object): if not stem.prereq.is_crypto_available(): raise ValueError('Generating the signed digest requires pycrypto') - from Crypto.Util import asn1 - from Crypto.Util.number import bytes_to_long, long_to_bytes + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives.serialization import load_der_public_key + from cryptography.utils import int_to_bytes, int_from_bytes - # get the ASN.1 sequence - - seq = asn1.DerSequence() - seq.decode(_bytes_for_block(signing_key)) - modulus, public_exponent = seq[0], seq[1] + key = load_der_public_key(_bytes_for_block(signing_key), default_backend()) + modulus = key.public_numbers().n + public_exponent = key.public_numbers().e sig_as_bytes = _bytes_for_block(signature) - sig_as_long = bytes_to_long(sig_as_bytes) # convert signature to an int + sig_as_long = int_from_bytes(sig_as_bytes, byteorder='big') # convert signature to an int blocksize = 128 # block size will always be 128 for a 1024 bit key # use the public exponent[e] & the modulus[n] to decrypt the int @@ -583,8 +582,7 @@ class Descriptor(object): decrypted_int = pow(sig_as_long, public_exponent, modulus) # convert the int to a byte array - - decrypted_bytes = long_to_bytes(decrypted_int, blocksize) + decrypted_bytes = int_to_bytes(decrypted_int, blocksize) ############################################################################ # The decrypted bytes should have a structure exactly along these lines.

1 0

[stem/master] Completely deprecate pycrypto
by atagar＠torproject.org 26 Feb '17

26 Feb '17

commit 116787a0ee17e46cd587a3a4a40239a53890039e Author: Patrick O'Doherty <p(a)trickod.com> Date: Sun Feb 26 15:32:02 2017 -0800 Completely deprecate pycrypto Update the sign_descriptor_content in mocking.py to use cryptography. Remove pycrypto from the requirements.txt --- requirements.txt | 1 - stem/prereq.py | 9 +++++---- test/mocking.py | 42 ++++++++++++++---------------------------- test/settings.cfg | 14 +++++++------- 4 files changed, 26 insertions(+), 40 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5fb3d12..6dc054c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ mock pyflakes pycodestyle -pycrypto tox cryptography diff --git a/stem/prereq.py b/stem/prereq.py index 4574771..bf935b4 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -85,7 +85,7 @@ def is_python_3(): @lru_cache() def is_crypto_available(): """ - Checks if the pycrypto functions we use are available. This is used for + Checks if the cryptography functions we use are available. This is used for verifying relay descriptor signatures. :returns: **True** if we can use pycrypto and **False** otherwise @@ -94,9 +94,10 @@ def is_crypto_available(): from stem.util import log try: - from Crypto.PublicKey import RSA - from Crypto.Util import asn1 - from Crypto.Util.number import long_to_bytes + from cryptography.utils import int_from_bytes, int_to_bytes + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives.serialization import load_der_public_key + from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes return True except ImportError: log.log_once('stem.prereq.is_crypto_available', log.INFO, CRYPTO_UNAVAILABLE) diff --git a/test/mocking.py b/test/mocking.py index 0d9e6f0..8babe76 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -722,33 +722,19 @@ def sign_descriptor_content(desc_content): if not stem.prereq.is_crypto_available(): return desc_content else: - from Crypto.PublicKey import RSA - from Crypto.Util import asn1 - from Crypto.Util.number import long_to_bytes - - # generate a key - private_key = RSA.generate(1024) - - # get a string representation of the public key - seq = asn1.DerSequence() - seq.append(private_key.n) - seq.append(private_key.e) - seq_as_string = seq.encode() - public_key_string = base64.b64encode(seq_as_string) - - # split public key into lines 64 characters long - public_key_string = b'\n'.join([ - public_key_string[:64], - public_key_string[64:128], - public_key_string[128:], - ]) + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives import hashes + from cryptography.hazmat.primitives.asymmetric import rsa, padding + from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat + + private_key = rsa.generate_private_key(public_exponent=65537, key_size=1024, backend=default_backend()) + public_key = private_key.public_key() - # generate the new signing key string + # Get a string representation of the public key signing_key_token = b'\nsigning-key\n' # note the trailing '\n' is important here so as not to match the string elsewhere - signing_key_token_start = b'-----BEGIN RSA PUBLIC KEY-----\n' signing_key_token_end = b'\n-----END RSA PUBLIC KEY-----\n' - new_sk = signing_key_token + signing_key_token_start + public_key_string + signing_key_token_end + new_sk = signing_key_token + public_key.public_bytes(encoding=Encoding.PEM, format=PublicFormat.PKCS1) # update the descriptor string with the new signing key @@ -758,6 +744,7 @@ def sign_descriptor_content(desc_content): # generate the new fingerprint string + seq_as_string = public_key.public_bytes(encoding=Encoding.DER, format=PublicFormat.PKCS1) key_hash = stem.util.str_tools._to_bytes(hashlib.sha1(seq_as_string).hexdigest().upper()) grouped_fingerprint = b'' @@ -799,16 +786,15 @@ def sign_descriptor_content(desc_content): # 2 bytes for the type info # 1 byte for the separator - padding = b'' + digest_padding = b'' for x in range(125 - len(new_digest)): - padding += b'\xFF' - digestBuffer = b'\x00\x01' + padding + b'\x00' + new_digest + digest_padding += b'\xFF' + digest_buffer = b'\x00\x01' + digest_padding + b'\x00' + new_digest # generate a new signature by signing the digest buffer with the private key - (signature, ) = private_key.sign(digestBuffer, None) - signature_as_bytes = long_to_bytes(signature, 128) + signature_as_bytes = private_key.sign(digest_buffer, padding.PKCS1v15(), hashes.SHA1()) signature_base64 = base64.b64encode(signature_as_bytes) signature_base64 = b'b'.join([ diff --git a/test/settings.cfg b/test/settings.cfg index 4913202..f9c6c62 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -144,14 +144,14 @@ pyflakes.ignore stem/__init__.py => undefined name 'long' pyflakes.ignore stem/__init__.py => undefined name 'unicode' pyflakes.ignore stem/control.py => undefined name 'controller' pyflakes.ignore stem/manual.py => undefined name 'unichr' -pyflakes.ignore stem/prereq.py => 'Crypto.PublicKey.RSA' imported but unused -pyflakes.ignore stem/prereq.py => 'Crypto.Util.asn1' imported but unused -pyflakes.ignore stem/prereq.py => 'Crypto.Util.number.long_to_bytes' imported but unused -pyflakes.ignore stem/prereq.py => 'RSA' imported but unused -pyflakes.ignore stem/prereq.py => 'asn1' imported but unused -pyflakes.ignore stem/prereq.py => 'unittest' 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.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 +pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.algorithms' imported but unused pyflakes.ignore stem/prereq.py => 'unittest.mock' imported but unused -pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused pyflakes.ignore stem/interpreter/__init__.py => undefined name 'raw_input' pyflakes.ignore stem/util/conf.py => undefined name 'unicode' pyflakes.ignore stem/util/test_tools.py => 'pyflakes' imported but unused

1 0

[stem/master] Replacing remaining references to pycrypto
by atagar＠torproject.org 26 Feb '17

26 Feb '17

commit 1551fc5e7688fc64dfb0e2f4bf91a9e841d64b37 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 26 16:41:51 2017 -0800 Replacing remaining references to pycrypto Functionally was perfect. Just a few lingering pycrypto references. Also few doc tweaks and pycodestyle ignore clauses (version I use gave some notices). --- docs/change_log.rst | 1 + docs/faq.rst | 22 +++++++++++++++++++--- run_tests.py | 2 +- stem/descriptor/__init__.py | 2 +- stem/descriptor/hidden_service_descriptor.py | 7 ++++++- stem/descriptor/server_descriptor.py | 5 +++++ stem/prereq.py | 9 +++++---- test/mocking.py | 4 ++-- test/settings.cfg | 16 ++++++++-------- test/unit/descriptor/hidden_service_descriptor.py | 4 ++-- test/util.py | 4 ++-- 11 files changed, 52 insertions(+), 24 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index edd5fa8..eccac73 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -50,6 +50,7 @@ The following are only available within Stem's `git repository * **Descriptors** + * Moved from the deprecated `pycrypto <https://www.dlitz.net/software/pycrypto/>`_ module to `cryptography <https://pypi.python.org/pypi/cryptography>`_ for validating signatures (:trac:`21086`) * Sped descriptor reading by ~25% by deferring defaulting when validating * Support for protocol descriptor fields (:spec:`eb4fb3c`) * Shared randomness properties weren't being read in votes (:trac:`21102`) diff --git a/docs/faq.rst b/docs/faq.rst index a9e274c..69033d4 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -52,11 +52,27 @@ Does Stem have any dependencies? **No.** All you need in order to use Stem is Python. -When it is available Stem will use `pycrypto -<https://www.dlitz.net/software/pycrypto/>`_ to validate descriptor signatures. -However, there is no need to install pycrypto unless you need this +When it is available Stem will use `cryptography +<https://pypi.python.org/pypi/cryptography>`_ to validate descriptor signatures. +However, there is no need to install cryptography unless you need this functionality. +Note that if cryptography installation fails with... + +:: + + build/temp.linux-i686-2.7/_openssl.c:18:20: fatal error: Python.h: No such file or directory + compilation terminated. + error: command 'gcc' failed with exit status 1 + +You need python-dev. For instance on Debian and Ubuntu you can install +cryptography with... + +:: + + % sudo apt-get install python-dev + % sudo pip install cryptography + .. _what_python_versions_is_stem_compatible_with: What Python versions is Stem compatible with? diff --git a/run_tests.py b/run_tests.py index 39c44cb..bceade3 100755 --- a/run_tests.py +++ b/run_tests.py @@ -160,7 +160,7 @@ def main(): Task('checking stem version', test.util.check_stem_version), tor_version_check, Task('checking python version', test.util.check_python_version), - Task('checking pycrypto version', test.util.check_pycrypto_version), + Task('checking cryptography version', test.util.check_cryptography_version), Task('checking mock version', test.util.check_mock_version), Task('checking pyflakes version', test.util.check_pyflakes_version), Task('checking pycodestyle version', test.util.check_pycodestyle_version), diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 5a6ec44..6e8c5a4 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -563,7 +563,7 @@ class Descriptor(object): """ if not stem.prereq.is_crypto_available(): - raise ValueError('Generating the signed digest requires pycrypto') + raise ValueError('Generating the signed digest requires the cryptography module') from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.serialization import load_der_public_key diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index 30754b8..ce3a134 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -199,6 +199,11 @@ class HiddenServiceDescriptor(Descriptor): **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined + + .. versionchanged:: 1.6.0 + Moved from the deprecated `pycrypto + <https://www.dlitz.net/software/pycrypto/>`_ module to `cryptography + <https://pypi.python.org/pypi/cryptography>`_ for validating signatures. """ ATTRIBUTES = { @@ -270,7 +275,7 @@ class HiddenServiceDescriptor(Descriptor): return [] elif authentication_cookie: if not stem.prereq.is_crypto_available(): - raise DecryptionFailure('Decrypting introduction-points requires pycrypto') + raise DecryptionFailure('Decrypting introduction-points requires the cryptography module') try: missing_padding = len(authentication_cookie) % 4 diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index ca6a16b..3aa5fb0 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -703,6 +703,11 @@ class RelayDescriptor(ServerDescriptor): Added the ed25519_certificate, ed25519_master_key, ed25519_signature, onion_key_crosscert, ntor_onion_key_crosscert, and ntor_onion_key_crosscert_sign attributes. + + .. versionchanged:: 1.6.0 + Moved from the deprecated `pycrypto + <https://www.dlitz.net/software/pycrypto/>`_ module to `cryptography + <https://pypi.python.org/pypi/cryptography>`_ for validating signatures. """ ATTRIBUTES = dict(ServerDescriptor.ATTRIBUTES, **{ diff --git a/stem/prereq.py b/stem/prereq.py index bf935b4..585b619 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -6,7 +6,7 @@ Checks for stem dependencies. We require python 2.6 or greater (including the 3.x series), but note we'll be bumping our requirements to python 2.7 in stem 2.0. Other requirements for complete functionality are... -* pycrypto module +* cryptography module * validating descriptor signature integrity @@ -14,7 +14,7 @@ Checks for stem dependencies. We require python 2.6 or greater (including the check_requirements - checks for minimum requirements for running stem is_python_3 - checks if python 3.0 or later is available - is_crypto_available - checks if the pycrypto module is available + is_crypto_available - checks if the cryptography module is available """ import inspect @@ -26,7 +26,7 @@ try: except ImportError: from stem.util.lru_cache import lru_cache -CRYPTO_UNAVAILABLE = "Unable to import the pycrypto module. Because of this we'll be unable to verify descriptor signature integrity. You can get pycrypto from: https://www.dlitz.net/software/pycrypto/" +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" def check_requirements(): @@ -88,7 +88,8 @@ def is_crypto_available(): Checks if the cryptography functions we use are available. This is used for verifying relay descriptor signatures. - :returns: **True** if we can use pycrypto and **False** otherwise + :returns: **True** if we can use the cryptography module and **False** + otherwise """ from stem.util import log diff --git a/test/mocking.py b/test/mocking.py index 8babe76..c293cf0 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -710,8 +710,8 @@ def sign_descriptor_content(desc_content): """ Add a valid signature to the supplied descriptor string. - If pycrypto is available the function will generate a key pair, and use it to - sign the descriptor string. Any existing fingerprint, signing-key or + If cryptography is available the function will generate a key pair, and use + it to sign the descriptor string. Any existing fingerprint, signing-key or router-signature data will be overwritten. If the library's unavailable the code will return the unaltered descriptor. diff --git a/test/settings.cfg b/test/settings.cfg index f9c6c62..c8172f6 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -144,14 +144,14 @@ pyflakes.ignore stem/__init__.py => undefined name 'long' pyflakes.ignore stem/__init__.py => undefined name 'unicode' pyflakes.ignore stem/control.py => undefined name 'controller' pyflakes.ignore stem/manual.py => undefined name 'unichr' -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.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 -pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.algorithms' imported but unused -pyflakes.ignore stem/prereq.py => 'unittest.mock' imported but unused +pyflakes.ignore stem/prereq.py => 'int_to_bytes' imported but unused +pyflakes.ignore stem/prereq.py => 'int_from_bytes' imported but unused +pyflakes.ignore stem/prereq.py => 'default_backend' imported but unused +pyflakes.ignore stem/prereq.py => 'load_der_public_key' imported but unused +pyflakes.ignore stem/prereq.py => 'modes' imported but unused +pyflakes.ignore stem/prereq.py => 'Cipher' imported but unused +pyflakes.ignore stem/prereq.py => 'algorithms' imported but unused +pyflakes.ignore stem/prereq.py => 'unittest' imported but unused pyflakes.ignore stem/interpreter/__init__.py => undefined name 'raw_input' pyflakes.ignore stem/util/conf.py => undefined name 'unicode' pyflakes.ignore stem/util/test_tools.py => 'pyflakes' imported but unused diff --git a/test/unit/descriptor/hidden_service_descriptor.py b/test/unit/descriptor/hidden_service_descriptor.py index 7b37ef0..74a0974 100644 --- a/test/unit/descriptor/hidden_service_descriptor.py +++ b/test/unit/descriptor/hidden_service_descriptor.py @@ -273,7 +273,7 @@ class TestHiddenServiceDescriptor(unittest.TestCase): """ if not stem.prereq.is_crypto_available(): - return test.runner.skip(self, 'requires pycrypto') + return test.runner.skip(self, 'requires cryptography') descriptor_file = open(get_resource('hidden_service_basic_auth'), 'rb') @@ -322,7 +322,7 @@ class TestHiddenServiceDescriptor(unittest.TestCase): """ if not stem.prereq.is_crypto_available(): - return test.runner.skip(self, 'requires pycrypto') + return test.runner.skip(self, 'requires cryptography') descriptor_file = open(get_resource('hidden_service_stealth_auth'), 'rb') diff --git a/test/util.py b/test/util.py index 1b50369..ce1f8e8 100644 --- a/test/util.py +++ b/test/util.py @@ -22,7 +22,7 @@ Tasks are... |- check_stem_version - checks our version of stem |- check_tor_version - checks our version of tor |- check_python_version - checks our version of python - |- check_pycrypto_version - checks our version of pycrypto + |- check_cryptography_version - checks our version of cryptography |- check_pyflakes_version - checks our version of pyflakes |- check_pycodestyle_version - checks our version of pycodestyle |- clean_orphaned_pyc - removes any *.pyc without a corresponding *.py @@ -214,7 +214,7 @@ def check_python_version(): return '.'.join(map(str, sys.version_info[:3])) -def check_pycrypto_version(): +def check_cryptography_version(): if stem.prereq.is_crypto_available(): import Crypto return Crypto.__version__

1 0

[torspec/master] 276 update w comments from teor
by nickm＠torproject.org 26 Feb '17

26 Feb '17

commit b1e94492ac661db37fab2efc0182d2b2998d5e3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 26 19:35:32 2017 -0500 276 update w comments from teor --- proposals/276-lower-bw-granularity.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/proposals/276-lower-bw-granularity.txt b/proposals/276-lower-bw-granularity.txt index 4d3735c..bca544b 100644 --- a/proposals/276-lower-bw-granularity.txt +++ b/proposals/276-lower-bw-granularity.txt @@ -33,20 +33,24 @@ Target: 0.3.1.x-alpha 3. Proposal - I propose that we round the bandwidth values as they are placed in - the votes to two no more than significant digits. In addition, for + I propose that we round the bandwidth values, as they are placed in votes, + to no more than two significant digits. In addition, for values beginning with decimal "2" through "4", we should round the first two digits the nearest multiple of 2. For values beginning with decimal "5" though "9", we should round to the nearest multiple of 5. - This change does not require a consensus method; it will take effect - once enough authorities have upgraded. + The change will take effect progressively as authorities upgrade: since + the median value is used, when one authority upgrades, 1/5 of the + bandwidths will be rounded (on average). + + Once all authorities upgrade, all bandwidths will be rounded like this. 4. Analysis - The rounding proposed above will not round any value by more than - 5%, so the overall impact on bandwidth balancing should be small. + The rounding proposed above will not round any value by more than 5% more + than current rounding, so the overall impact on bandwidth balancing should + be small. In order to assess the bandwidth savings of this approach, I smoothed the January 2017 consensus documents' Bandwidth fields,

1 0

[tor-browser-build/master] Fix multi lingual preferences
by boklm＠torproject.org 26 Feb '17

26 Feb '17

commit 6f779ad8eaab011f0f59775782543731bcd9ead3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 26 19:32:05 2017 +0100 Fix multi lingual preferences --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f952a95..4eeb350 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -122,7 +122,7 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/us popd [% END %] -[% IF c("var/multi_lingual") %] +[% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH echo 'pref("intl.locale.matchOS", false);' >> $TBDIR/$EXTOVERRIDESPATH [% END %]

1 0

[tor-browser-build/master] Fix typo in firefox --enable-update-channel option
by boklm＠torproject.org 26 Feb '17

26 Feb '17

commit 369b646afae308ec3f501b60177bafbe58298374 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 26 19:48:18 2017 +0100 Fix typo in firefox --enable-update-channel option The value of the --enable-update-channel option was empty because of this typo. --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index a8ef12f..42752d1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -79,7 +79,7 @@ export CC='gcc -m32' rm -f configure rm -f js/src/configure -make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --enable-update-channel=[% c("var/torbrowser_update_chanel") %] --enable-bundled-fonts" +make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true

1 0

[tor-browser-build/master] Remove -specs=msvcr100.spec from default flags on Windows
by boklm＠torproject.org 26 Feb '17

26 Feb '17

commit a89da94ef4e316091e97e9b87ca1b759330093ed Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 26 20:04:21 2017 +0100 Remove -specs=msvcr100.spec from default flags on Windows Doing the same as what we are currently doing in gitian, this flag is now used only in the firefox build. --- rbm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index 5a29308..e9f7b6d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -124,8 +124,8 @@ targets: windows: 1 osname: windows-i686 configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec [% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec [% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' + CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' + LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Feb '17

26 Feb '17

commit 495efab27f9778590aa386ff13f74752ada62161 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 26 17:18:18 2017 +0000 Update translations for tor-browser-manual --- da/da.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/da/da.po b/da/da.po index 01a6412..33ea96f 100644 --- a/da/da.po +++ b/da/da.po @@ -26,6 +26,7 @@ msgstr "scootergrisen, 2017" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" +"Lær hvad Tor Browser kan gøre for at beskytte dit privatliv og anonymitet" #: about-tor-browser.page:10 msgid "About Tor Browser" @@ -99,7 +100,7 @@ msgstr "" #: bridges.page:6 msgid "Learn what bridges are and how to get them" -msgstr "" +msgstr "Lær hvad broer er og hvordan de fås" #: bridges.page:10 msgid "Bridges" @@ -124,7 +125,7 @@ msgstr "" #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "" +msgstr "Få broadresser" #: bridges.page:29 msgid "" @@ -147,7 +148,7 @@ msgstr "" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "" +msgstr "Indtast broadresser" #: bridges.page:52 msgid "" @@ -313,7 +314,7 @@ msgstr "" #: downloading.page:34 msgid "To use GetTor via email:" -msgstr "" +msgstr "Brug GetTor via e-mail:" #: downloading.page:39 msgid "" @@ -519,7 +520,7 @@ msgstr "" #: known-issues.page:23 msgid "Webroot SecureAnywhere" -msgstr "" +msgstr "Webroot SecureAnywhere" #: known-issues.page:26 msgid "Kaspersky Internet Security 2012" @@ -527,11 +528,11 @@ msgstr "Kaspersky Internet Security 2012" #: known-issues.page:29 msgid "Sophos Antivirus for Mac" -msgstr "" +msgstr "Sophos Antivirus til Mac" #: known-issues.page:32 msgid "Microsoft Security Essentials" -msgstr "" +msgstr "Microsoft Security Essentials" #: known-issues.page:37 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Feb '17

26 Feb '17

commit d24f7ea78dd2d5094a8b20539b20b02d6af164e7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 26 11:18:17 2017 +0000 Update translations for tor-browser-manual --- nl/nl.po | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 3493cf7..21514e6 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -4,6 +4,7 @@ # enc <buzzkruid(a)hotmail.com>, 2016 # runasand <inactive+runasand(a)transifex.com>, 2016 # Stijn <stijn.vansieleghem(a)gmail.com>, 2016 +# kwadronaut <kwadronaut(a)autistici.org>, 2016 # André Koot <meneer(a)tken.net>, 2016 # Wim <wikkesjr(a)gmail.com>, 2017 # Stefan Roukens <info(a)stefanroukens.nl>, 2017 @@ -30,8 +31,8 @@ msgstr "" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" -"Lees meer over hoe de Torbrowser je kan helpen je privacy en anonimiteit te " -"beschermen" +"Lees meer over hoe de Tor Browser je kan helpen je privacy en anonimiteit te" +" beschermen" #: about-tor-browser.page:10 msgid "About Tor Browser" @@ -65,6 +66,9 @@ msgid "" "In addition, Tor Browser is designed to prevent websites from " "“fingerprinting” or identifying you based on your browser configuration." msgstr "" +"Daarnaast is de Tor Browser ontworpen om te voorkomen dat websites je " +"\"vingerafdruk\" kunnen nemen of je identificeren aan de hand van je " +"browserconfiguratie." #: about-tor-browser.page:39 msgid "" @@ -345,7 +349,7 @@ msgstr "" #: downloading.page:34 msgid "To use GetTor via email:" -msgstr "" +msgstr "Om GetTor via e-mail te gebruiken:" #: downloading.page:39 msgid "" @@ -353,6 +357,9 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"Stuur een e-mail naar gettor(a)torproject.org en schrijf in het e-mailbericht " +"\"windows”, “osx”, of “linux”, (zonder aanhalingstekens) afhankelijk van " +"welk besturingssysteem je hebt." #: downloading.page:46 msgid "" @@ -366,7 +373,7 @@ msgstr "" #: downloading.page:57 msgid "To use GetTor via Twitter:" -msgstr "" +msgstr "Om GetTor via Twitter te gebruiken:" #: downloading.page:62 msgid "" @@ -725,7 +732,7 @@ msgstr "" #: managing-identities.page:101 msgid "Changing identities and circuits" -msgstr "" +msgstr "Wisselen van identiteiten en circuits" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0