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

[stem/master] Compression support for ORPort descriptor downloads
by atagar＠torproject.org 29 Apr '18

29 Apr '18

commit 5a875ed329ddb119c2b6787e051571fb7323f622 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 28 16:47:42 2018 -0700 Compression support for ORPort descriptor downloads Compression works the same regardless of of if we download from an ORPort or DirPort. Also including a couple python3 compatibility fixes for circuit construction. --- stem/client/__init__.py | 4 +- stem/descriptor/remote.py | 88 +++++++++++++++++++++++++++--------------- test/unit/descriptor/remote.py | 10 ++--- 3 files changed, 62 insertions(+), 40 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index aa4aa274..6e25f748 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -168,7 +168,7 @@ class Relay(object): if not created_fast_cells: raise ValueError('We should get a CREATED_FAST response from a CREATE_FAST request') - created_fast_cell = created_fast_cells[0] + created_fast_cell = list(created_fast_cells)[0] kdf = KDF.from_value(create_fast_cell.key_material + created_fast_cell.key_material) if created_fast_cell.derivative_key != kdf.key_hash: @@ -211,7 +211,7 @@ class Circuit(object): from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.backends import default_backend - ctr = modes.CTR(ZERO * (algorithms.AES.block_size / 8)) + ctr = modes.CTR(ZERO * (algorithms.AES.block_size // 8)) self.relay = relay self.id = circ_id diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index e745ce20..d6832eaa 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -254,7 +254,7 @@ def get_consensus(authority_v3ident = None, microdescriptor = False, **query_arg return get_instance().get_consensus(authority_v3ident, microdescriptor, **query_args) -def _download_from_orport(endpoint, resource): +def _download_from_orport(endpoint, compression, resource): """ Downloads descriptors from the given orport. Payload is just like an http response (headers and all)... @@ -273,6 +273,7 @@ def _download_from_orport(endpoint, resource): ... rest of the descriptor content... :param stem.ORPort endpoint: endpoint to download from + :param list compression: compression methods for the request :param str resource: descriptor resource to download :returns: two value tuple of the form (data, reply_headers) @@ -286,26 +287,30 @@ def _download_from_orport(endpoint, resource): with stem.client.Relay.connect(endpoint.address, endpoint.port, link_protocols) as relay: with relay.create_circuit() as circ: + request = '\r\n'.join(( + 'GET %s HTTP/1.0' % resource, + 'Accept-Encoding: %s' % ', '.join(compression), + 'User-Agent: Stem/%s' % stem.__version__, + )) + '\r\n\r\n' + circ.send('RELAY_BEGIN_DIR', stream_id = 1) - lines = b''.join([cell.data for cell in circ.send('RELAY_DATA', 'GET %s HTTP/1.0\r\n\r\n' % resource, stream_id = 1)]).splitlines() - first_line = lines.pop(0) + response = b''.join([cell.data for cell in circ.send('RELAY_DATA', request, stream_id = 1)]) + first_line, data = response.split(b'\r\n', 1) + header_data, data = data.split(b'\r\n\r\n', 1) - if first_line != 'HTTP/1.0 200 OK': + if first_line != b'HTTP/1.0 200 OK': raise stem.ProtocolError("Response should begin with HTTP success, but was '%s'" % first_line) headers = {} - next_line = lines.pop(0) - while next_line: - if ': ' not in next_line: - raise stem.ProtocolError("'%s' is not a HTTP header:\n\n%s" % next_line) + for line in str_tools._to_unicode(header_data).splitlines(): + if ': ' not in line: + raise stem.ProtocolError("'%s' is not a HTTP header:\n\n%s" % line) - key, value = next_line.split(': ', 1) + key, value = line.split(': ', 1) headers[key] = value - next_line = lines.pop(0) - - return '\n'.join(lines), headers + return _decompress(data, headers.get('Content-Encoding')), headers def _download_from_dirport(url, compression, timeout): @@ -334,29 +339,49 @@ def _download_from_dirport(url, compression, timeout): timeout = timeout, ) - data = response.read() - encoding = response.headers.get('Content-Encoding') + return _decompress(response.read(), response.headers.get('Content-Encoding')), response.headers - # Tor doesn't include compression headers. As such when using gzip we - # need to include '32' for automatic header detection... - # - # https://stackoverflow.com/questions/3122145/zlib-error-error-3-while-decomp… - # - # ... and with zstd we need to use the streaming API. - if encoding in (Compression.GZIP, 'deflate'): - data = zlib.decompress(data, zlib.MAX_WBITS | 32) - elif encoding == Compression.ZSTD and ZSTD_SUPPORTED: +def _decompress(data, encoding): + """ + Decompresses descriptor data. + + Tor doesn't include compression headers. As such when using gzip we + need to include '32' for automatic header detection... + + https://stackoverflow.com/questions/3122145/zlib-error-error-3-while-decomp… + + ... and with zstd we need to use the streaming API. + + :param bytes data: data we received + :param str encoding: 'Content-Encoding' header of the response + + :raises: + * **ValueError** if encoding is unrecognized + * **ImportError** if missing the decompression module + """ + + if encoding == Compression.PLAINTEXT: + return data.strip() + elif encoding in (Compression.GZIP, 'deflate'): + return zlib.decompress(data, zlib.MAX_WBITS | 32).strip() + elif encoding == Compression.ZSTD: + if not ZSTD_SUPPORTED: + raise ImportError('Decompressing zstd data requires https://pypi.python.org/pypi/zstandard') + output_buffer = io.BytesIO() with zstd.ZstdDecompressor().write_to(output_buffer) as decompressor: decompressor.write(data) - data = output_buffer.getvalue() - elif encoding == Compression.LZMA and LZMA_SUPPORTED: - data = lzma.decompress(data) + return output_buffer.getvalue().strip() + elif encoding == Compression.LZMA: + if not LZMA_SUPPORTED: + raise ImportError('Decompressing lzma data requires https://docs.python.org/3/library/lzma.html') - return data.strip(), response.headers + return lzma.decompress(data).strip() + else: + raise ValueError("'%s' isn't a recognized type of encoding" % encoding) def _guess_descriptor_type(resource): @@ -476,6 +501,9 @@ class Query(object): :var list endpoints: :class:`~stem.DirPort` or :class:`~stem.ORPort` of the authority or mirror we're querying, this uses authorities if undefined + :var list compression: list of :data:`stem.descriptor.remote.Compression` + we're willing to accept, when none are mutually supported downloads fall + back to Compression.PLAINTEXT :var int retries: number of times to attempt the request if downloading it fails :var bool fall_back_to_authority: when retrying request issues the last @@ -500,11 +528,7 @@ class Query(object): Following are only applicable when downloading from a :class:`~stem.DirPort`... - :var list compression: list of :data:`stem.descriptor.remote.Compression` - we're willing to accept, when none are mutually supported downloads fall - back to Compression.PLAINTEXT :var float timeout: duration before we'll time out our request - :var str download_url: last url used to download the descriptor, this is unset until we've actually made a download attempt @@ -683,7 +707,7 @@ class Query(object): endpoint = self._pick_endpoint(use_authority = retries == 0 and self.fall_back_to_authority) if isinstance(endpoint, stem.ORPort): - self.content, self.reply_headers = _download_from_orport(endpoint, self.resource) + self.content, self.reply_headers = _download_from_orport(endpoint, self.compression, self.resource) elif isinstance(endpoint, stem.DirPort): self.download_url = 'http://%s:%i/%s' % (endpoint.address, endpoint.port, self.resource.lstrip('/')) self.content, self.reply_headers = _download_from_dirport(self.download_url, self.compression, timeout) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 040d4c6c..753681e0 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -12,6 +12,7 @@ import unittest import stem.descriptor.remote import stem.prereq import stem.util.conf +import stem.util.str_tools from stem.descriptor.remote import Compression from test.unit.descriptor import read_resource @@ -126,10 +127,9 @@ HEADER = '\r\n'.join([ 'Content-Encoding: %s', ]) -ORPORT_DESCRIPTOR = 'HTTP/1.0 200 OK\n' + HEADER + '\n\n' + TEST_DESCRIPTOR - -def _orport_mock(data): +def _orport_mock(data, encoding = 'identity'): + data = b'HTTP/1.0 200 OK\r\n' + stem.util.str_tools._to_bytes(HEADER % encoding) + b'\r\n\r\n' + data cells = [] for hunk in [data[i:i + 50] for i in range(0, len(data), 50)]: @@ -167,7 +167,7 @@ class TestDescriptorDownloader(unittest.TestCase): # prevent our mocks from impacting other tests stem.descriptor.remote.SINGLETON_DOWNLOADER = None - @patch('stem.client.Relay.connect', _orport_mock(ORPORT_DESCRIPTOR)) + @patch('stem.client.Relay.connect', _orport_mock(TEST_DESCRIPTOR)) def test_using_orport(self): """ Download a descriptor through the ORPort. @@ -175,7 +175,6 @@ class TestDescriptorDownloader(unittest.TestCase): reply = stem.descriptor.remote.their_server_descriptor( endpoints = [stem.ORPort('12.34.56.78', 1100)], - fall_back_to_authority = False, validate = True, ) @@ -191,7 +190,6 @@ class TestDescriptorDownloader(unittest.TestCase): reply = stem.descriptor.remote.their_server_descriptor( endpoints = [stem.DirPort('12.34.56.78', 1100)], - fall_back_to_authority = False, validate = True, )

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit 656065ae84f7af3f3432d50a9aa1fc3ec47aba69 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 23:15:28 2018 +0000 Update translations for whisperback_completed --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index 1af19ff75..7cd6cc177 100644 --- a/da/da.po +++ b/da/da.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-04-12 18:55+0000\n" -"Last-Translator: cacapo <handelsehorisont(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-28 22:47+0000\n" +"Last-Translator: Kasper Friis Christensen <kasper(a)friischristensen.com>\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit bec9469b9623081b18d23eed855796c82d325175 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 23:15:23 2018 +0000 Update translations for whisperback --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index 1af19ff75..7cd6cc177 100644 --- a/da/da.po +++ b/da/da.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-04-12 18:55+0000\n" -"Last-Translator: cacapo <handelsehorisont(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-28 22:47+0000\n" +"Last-Translator: Kasper Friis Christensen <kasper(a)friischristensen.com>\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/support-tormobile] Update translations for support-tormobile
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit 9239137704c7f40e0fdb4039d7a4dad13530069e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 22:52:00 2018 +0000 Update translations for support-tormobile --- da.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/da.json b/da.json index d832318fe..fd9261d49 100644 --- a/da.json +++ b/da.json @@ -2,31 +2,31 @@ "tormobile-1": { "id": "#tormobile-1", "control": "tormobile-1", - "title": "Can I run Tor on an Android device?", + "title": "Kan jeg benytte Tor på en Android enhed?", "description": "<p class=\"mb-3\">Tor on Android is provided by The Guardian Project. More information can be found on the <mark><a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a></mark> and <mark><a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a></mark> web pages. Orbot is for web browsing, and Orfox can route other apps on your Android phone over the Tor network.</p>" }, "tormobile-2": { "id": "#tormobile-2", "control": "tormobile-2", - "title": "Who is the Guardian Project?", + "title": "Hvem er Guardian Project? ", "description": "<p class=\"mb-3\">The Guardian Project maintains Tor (and other privacy applications) on Android. More info can be found on the <mark><a href=\"https://guardianproject.info/\">Guardian Project's website</a></mark>.</p>" }, "tormobile-3": { "id": "#tormobile-3", "control": "tormobile-3", - "title": "Can I run Tor on an iOS device?", + "title": "Kan jeg benytte Tor på en iOS enhed?", "description": "<p class=\"mb-3\"> We recommend an iOS app called Onion Browser, which is open source, uses Tor routing, and is developed by someone who works closely with the Tor Project. However, Apple requires browsers on iOS to use something called Webkit, which prevents Onion Browser from having the same privacy protections as Tor Browser. <mark><a href=\"https://blog.torproject.org/tor-heart-onion-browser-and-more-ios-tor\">Learn more about Onion Browser</a></mark>.</p>" }, "tormobile-4": { "id": "#tormobile-4", "control": "tormobile-4", - "title": "How do I run Tor on Windows Phone?", - "description": "<p class=\"mb-3\">There is currently no supported method for running Tor on Windows Phone.</p>" + "title": "Kan jeg benytte Tor på en Windows Phone enhed?", + "description": "<p class=\"mb-3\">Du kan desværre ikke på nuværende tidspunkt benytte Tor på Windows Phone.</p>" }, "tormobile-5": { "id": "#tormobile-5", "control": "tormobile-5", - "title": "When is Tor Browser for Android being released?", + "title": "Hvornår bliver Tor Browser til Android udgivet?", "description": "<p class=\"mb-3\">We are currently working on Tor Browser for Android, and you may see alpha releases appear over the coming months. Please watch our <mark><a href=\"https://blog.torproject.org\">blog</a></mark> for future announcements and details regarding this project.</p>" } }

1 0

[translation/support-topics] Update translations for support-topics
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit 3921666a60521fb154931d232d968e2b56f2d479 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 22:51:43 2018 +0000 Update translations for support-topics --- da.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da.json b/da.json index bd776f11d..94b0fcb70 100644 --- a/da.json +++ b/da.json @@ -2,7 +2,7 @@ "faq": { "path": "#faq", "control": "faq", - "label": "Most Frequently Asked Questions" + "label": "Oftest stillede spørgsmål" }, "tbb": { "path": "#tbb", @@ -27,12 +27,12 @@ "connecting": { "path": "#connectingtotor", "control": "connectingtotor", - "label": "Connecting To Tor" + "label": "Opretter forbindelse til Tor" }, "censorship": { "path": "#censorship", "control": "censorship", - "label": "Censorship" + "label": "Censur" }, "https": { "path": "#https", @@ -47,7 +47,7 @@ "onionservices": { "path": "#onionservices", "control": "onionservices", - "label": "Løg-tjenester" + "label": "Onion Services" }, "misc": { "path": "#misc",

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit 8914473f2ab87d82387b19479c1afe282a988aac Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 22:51:34 2018 +0000 Update translations for support-tbb --- da.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/da.json b/da.json index eb16e2240..fa709747f 100644 --- a/da.json +++ b/da.json @@ -20,7 +20,7 @@ "tbb-4": { "id": "#tbb-4", "control": "tbb-4", - "title": "Why is Tor Browser built from Firefox and not some other browser", + "title": "Hvorfor er Tor Browser bygget på Firefox og ikke en anden browser?", "description": "<p class=\"mb-3\">Tor Browser is a modified version of Firefox specifically designed for use with Tor. A lot of work has been put into making the Tor Browser, including the use of extra patches to enhance privacy and security. While it is technically possible to use Tor with other browsers, you may open yourself up to potential attacks or information leakage, so we strongly discourage it. <mark><a href=\"https://www.torproject.org/projects/torbrowser/design/\">Learn more about the design of Tor Browser</a></mark>.</p>" }, "tbb-5": { @@ -32,8 +32,8 @@ "tbb-6": { "id": "#tbb-6", "control": "tbb-6", - "title": "Can I make Tor Browser my default browser?", - "description": "<p class=\"mb-3\">Unfortunately, there is no supported way to make Tor Browser your default browser.</p>" + "title": "Kan jeg benytte Tor Browser som min fortrukne browser?", + "description": "<p class=\"mb-3\">Desværre, du kan desværre ikke vælge Tor Browser som din foretrukne browser.</p>" }, "tbb-7": { "id": "#tbb-7", @@ -74,7 +74,7 @@ "tbb-12": { "id": "#tbb-12", "control": "tbb-12", - "title": "Can I use Flash in Tor Browser?", + "title": "Virker Flash i Tor Browser?", "description": "<p class=\"mb-3\">Flash is disabled in Tor Browser, and we recommend you do not enable it. We don’t think Flash is safe to use in any browser — it's a very insecure piece of software that can easily compromise your privacy or serve you malware. Fortunately, most websites, devices, and other browsers are moving away from the use of Flash.</p>" }, "tbb-13": { @@ -164,13 +164,13 @@ "tbb-27": { "id": "#tbb-27", "control": "tbb-27", - "title": "How do I update Tor Browser?", + "title": "Hvordan opdatere jeg Tor Browser?", "description": "<p class=\"mb-3\">You can update Tor Browser as soon as a new version is released.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image4.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Tor Browser will prompt you to update the software once a new version has been released.</h4><p class=\"card-text\">The Torbutton icon (the little green onion in the top left corner of the browser) will display a yellow triangle.</p></div></div></div><p class=\"mb-3\">You may see a written indication when Tor Browser opens telling you that an update is available.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image5.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div><p class=\"mb-3\">Tor browser will install the updates.</p><div class=\"col-md-6\"><div clas s=\"card\"><img class=\"card-img-top\" src=\"/static/images/image3.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div>" }, "tbb-28": { "id": "#tbb-28", "control": "tbb-28", - "title": "How do I uninstall Tor Browser?", + "title": "Hvordan afinstallerer jeg Tor Browser?", "description": "<p class=\"mb-3\">Removing Tor Browser from your system is simple:</p><p class=\"mb-3\"><ol><li>Locate your Tor Browser folder or application. The default location on Windows is the Desktop; on macOS it is the Applications folder (on macOS, you have to move it into the Applications folder when you complete the installation process). On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser.</li><li>Delete the Tor Browser folder or application.</li><li>Empty your Trash.</li></ol></p><p class=\"mb-3\">Note that your operating system’s standard \"Uninstall\" utility is not used.</p>" }, "tbb-29": {

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit 3a0f0f616aad1c68b5e2cd43a34889ea84efe114 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 22:51:25 2018 +0000 Update translations for support-miscellaneous --- da.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/da.json b/da.json index c29993d09..23ef7b67c 100644 --- a/da.json +++ b/da.json @@ -14,13 +14,13 @@ "misc-3": { "id": "#misc-3", "control": "misc-3", - "title": "Who funds Tor?", + "title": "Hvem finansierer Tor?", "description": "<p class=\"mb-3\">Tor is funded by a number of different sponsors including US federal agencies, private foundations, and individual donors. Check out a list of all <mark><a href=\"https://www.torproject.org/about/sponsors.html.en\">our sponsors</a></mark> and a series of <mark><a href=\"https://blog.torproject.org/category/tags/form-990\">blog posts</a></mark> on our financial reports.</p><p class=\"mb-3\">We feel that talking openly about our funders and funding model is the best way to maintain trust with our community. We are always seeking more diversity in our funding sources, especially from foundations and individuals.</p>" }, "misc-4": { "id": "#misc-4", "control": "misc-4", - "title": "Can I use Tor with bittorrent?", + "title": "Kan jeg benytte Tor med bittorrent?", "description": "<p class=\"mb-3\">We do not recommend using Tor with bittorrent. For further details, please see our <mark><a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">blog post on the subject</a></mark>.</p>" }, "misc-5": { @@ -32,7 +32,7 @@ "misc-6": { "id": "#misc-6", "control": "misc-6", - "title": "Does Tor keep logs?", + "title": "Gemmer Tor logfiler?", "description": "<p class=\"mb-3\">Tor doesn't keep any logs that could identify a particular user. We do take some safe measurements of how the network functions, which you can check out at <mark><a href=\"https://metrics.torproject.org/\">Tor Metrics</a></mark>.</p>" }, "misc-7": { @@ -44,7 +44,7 @@ "misc-8": { "id": "#misc-8", "control": "misc-8", - "title": "Can I use the Tor logo in my product?", + "title": "Kan jeg benytte Tor logoet i mit eget produkt?", "description": "<p class=\"mb-3\">You can read all about that on our <mark><a href=\"https://www.torproject.org/docs/trademark-faq.html\">Trademark faq page</a></mark>.</p>" }, "misc-9": { @@ -74,7 +74,7 @@ "misc-13": { "id": "#misc-13", "control": "misc-13", - "title": "Can I use a VPN with Tor?", + "title": "Kan jeg benytte en VPN sammen med Tor?", "description": "<p class=\"mb-3\">Generally speaking, we don't recommend using a VPN with Tor unless you're an advanced user who knows how to configure both in a way that doesn't compromise your privacy. You can find more detailed information about Tor + VPN at <mark><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">our wiki</a></mark>.</p>" }, "misc-14": {

1 0

[translation/support-faq] Update translations for support-faq
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit eb4a851f4781ae2ab9868afdd10c64a2da86c9f8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 22:50:56 2018 +0000 Update translations for support-faq --- da.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.json b/da.json index a4a631779..4c8e8838d 100644 --- a/da.json +++ b/da.json @@ -26,7 +26,7 @@ "faq-5": { "id": "#faq-5", "control": "faq-5", - "title": "Can I use a VPN with Tor?", - "description": "<p class=\"mb-3\">Generally speaking, we don't recommend using a VPN with Tor unless you're an advanced user who knows how to configure both in a way that doesn't compromise your privacy. Learn more about combining Tor + VPN.</p>" + "title": "Kan jeg benytte en VPN sammen med Tor?", + "description": "<p class=\"mb-3\">Som udgangspunkt anbefaler vi ikke at du benytter en VPN sammen med Tor. Medmindre du ved hvordan du konfigurere begge dele, på en måde så du ikke går på kompromis med dit privatliv. Lær mere om at kombinere Tor + VPN.</p>" } }

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit 1a5ffe66f625563993f89c8f29a1eaae657d63ca Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 22:50:29 2018 +0000 Update translations for tor-browser-manual --- da/da.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index ed5d1bf50..e528c8471 100644 --- a/da/da.po +++ b/da/da.po @@ -5,12 +5,13 @@ # Aputsiak Niels Janussen (Skjalden) <aj(a)isit.gl>, 2016 # Anders Damsgaard <andersd(a)riseup.net>, 2016 # OliverMller <theoliver(a)live.co.uk>, 2016 +# Kasper Friis Christensen <kasper(a)friischristensen.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: OliverMller <theoliver(a)live.co.uk>, 2016\n" +"Last-Translator: Kasper Friis Christensen <kasper(a)friischristensen.com>, 2017\n" "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,9 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "scootergrisen, 2017" +msgstr "" +"scootergrisen, 2017\n" +"fALKENdk, 2018" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 28 Apr '18

28 Apr '18

commit 98f753b5ed48b88926a06e88360fb538d4051b75 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 22:21:35 2018 +0000 Update translations for support-tbb --- da.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.json b/da.json index e4ba34fc5..eb16e2240 100644 --- a/da.json +++ b/da.json @@ -122,8 +122,8 @@ "tbb-20": { "id": "#tbb-20", "control": "tbb-20", - "title": "Tor Browser won't connect, but it doesn’t seem to be an issue with censorship.", - "description": "<p class=\"mb-3\">One of the most common issues that causes connection errors in Tor Browser is an incorrect system clock. Please make sure your system clock and timezone are set accurately. If this doesn't fix the problem, see the Troubleshooting page on the <mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a></mark>.</p>" + "title": "Tor Browser kan ikke oprette forbindelse, men det ser ikke ud til skyldes censur.", + "description": " Tor Browser manualen\n\n<p class=\"mb-3\">En af de mest almindelige årsager til at Tor Browser ikke kan få forbindelse, er at system tiden er sat forkert. Tjek at din system tid og tidszone er sat korrekt. Hvis ikke dette løser problemet, kan du læse mere i <mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manualen</a></mark>.</p>" }, "tbb-21": { "id": "#tbb-21",

1 0