July 2020 - tor-commits - lists.torproject.org

[stem/master] Move Synchronous to its own module
by atagar＠torproject.org 25 Jul '20

25 Jul '20

commit c1bad9e9b249388ee9c6e29b0cb75da0ad6eea64 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 25 15:59:54 2020 -0700 Move Synchronous to its own module This class has grown sophisticated enough that it deserves its own module. Also, I'd like to discuss this with the wider python community and this will make it easier to cite. --- stem/control.py | 3 +- stem/descriptor/remote.py | 3 +- stem/util/__init__.py | 232 +------------------------ stem/util/asyncio.py | 238 ++++++++++++++++++++++++++ test/settings.cfg | 2 +- test/unit/util/__init__.py | 1 + test/unit/util/{synchronous.py => asyncio.py} | 8 +- 7 files changed, 250 insertions(+), 237 deletions(-) diff --git a/stem/control.py b/stem/control.py index 47b8a37c..578a471d 100644 --- a/stem/control.py +++ b/stem/control.py @@ -269,7 +269,8 @@ import stem.util.tor_tools import stem.version from stem import UNDEFINED, CircStatus, Signal -from stem.util import Synchronous, log +from stem.util import log +from stem.util.asyncio import Synchronous from types import TracebackType from typing import Any, AsyncIterator, Awaitable, Callable, Dict, List, Mapping, Optional, Sequence, Set, Tuple, Type, Union diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index ff4b1403..2e9ec641 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -99,7 +99,8 @@ import stem.util.enum import stem.util.tor_tools from stem.descriptor import Compression -from stem.util import Synchronous, log, str_tools +from stem.util import log, str_tools +from stem.util.asyncio import Synchronous from typing import Any, AsyncIterator, Dict, List, Optional, Sequence, Tuple, Union # Tor has a limited number of descriptors we can fetch explicitly by their diff --git a/stem/util/__init__.py b/stem/util/__init__.py index c525dd6f..7d5ca853 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -5,18 +5,12 @@ Utility functions used by the stem library. """ -import asyncio import datetime -import functools -import inspect -import threading -import typing -import unittest.mock -from types import TracebackType -from typing import Any, AsyncIterator, Iterator, Optional, Type, Union +from typing import Any, Union __all__ = [ + 'asyncio', 'conf', 'connection', 'enum', @@ -148,225 +142,3 @@ def _hash_attr(obj: Any, *attributes: str, **kwargs: Any) -> int: setattr(obj, '_cached_hash', my_hash) return my_hash - - -class Synchronous(object): - """ - Mixin that lets a class run within both synchronous and asynchronous - contexts. - - :: - - class Example(Synchronous): - async def hello(self): - return 'hello' - - def sync_demo(): - instance = Example() - print('%s from a synchronous context' % instance.hello()) - instance.stop() - - async def async_demo(): - instance = Example() - print('%s from an asynchronous context' % await instance.hello()) - instance.stop() - - sync_demo() - asyncio.run(async_demo()) - - Our async methods always run within a loop. For asyncio users this class has - no affect, but otherwise we transparently create an async context to run - within. - - Class initialization and any non-async methods should assume they're running - within an synchronous context. If our class supplies an **__ainit__()** - method it is invoked within our loop during initialization... - - :: - - class Example(Synchronous): - def __init__(self): - super(Example, self).__init__() - - # Synchronous part of our initialization. Avoid anything - # that must run within an asyncio loop. - - def __ainit__(self): - # Asychronous part of our initialization. You can call - # asyncio.get_running_loop(), and construct objects that - # require it (like asyncio.Queue and asyncio.Lock). - - Users are responsible for calling :func:`~stem.util.Synchronous.stop` when - finished to clean up underlying resources. - """ - - def __init__(self) -> None: - self._loop = None # type: Optional[asyncio.AbstractEventLoop] - self._loop_thread = None # type: Optional[threading.Thread] - self._loop_lock = threading.RLock() - - # this class is a no-op when created within an asyncio context - - self._no_op = Synchronous.is_asyncio_context() - - if self._no_op: - # TODO: replace with get_running_loop() when we remove python 3.6 support - - self._loop = asyncio.get_event_loop() - self.__ainit__() # this is already an asyncio context - else: - # Run coroutines through our loop. This calls methods by name rather than - # reference so runtime replacements (like mocks) work. - - for name, func in inspect.getmembers(self): - if name in ('__aiter__', '__aenter__', '__aexit__'): - pass # async object methods with synchronous counterparts - elif isinstance(func, unittest.mock.Mock) and inspect.iscoroutinefunction(func.side_effect): - setattr(self, name, functools.partial(self._run_async_method, name)) - elif inspect.ismethod(func) and inspect.iscoroutinefunction(func): - setattr(self, name, functools.partial(self._run_async_method, name)) - - Synchronous.start(self) - asyncio.run_coroutine_threadsafe(asyncio.coroutine(self.__ainit__)(), self._loop).result() - - def __ainit__(self): - """ - Implicitly called during construction. This method is assured to have an - asyncio loop during its execution. - """ - - # This method should be async (so 'await' works), but apparently that - # is not possible. - # - # When our object is constructed our __init__() can be called from a - # synchronous or asynchronous context. If synchronous, it's trivial to - # run an asynchronous variant of this method because we fully control - # the execution of our loop... - # - # asyncio.run_coroutine_threadsafe(self.__ainit__(), self._loop).result() - # - # However, when constructed from an asynchronous context the above will - # likely hang because our loop is already processing a task (namely, - # whatever is constructing us). While we can schedule a follow-up task, we - # cannot invoke it during our construction. - # - # Finally, when this method is simple we could directly invoke it... - # - # class Synchronous(object): - # def __init__(self): - # if Synchronous.is_asyncio_context(): - # try: - # self.__ainit__().send(None) - # except StopIteration: - # pass - # else: - # asyncio.run_coroutine_threadsafe(self.__ainit__(), self._loop).result() - # - # async def __ainit__(self): - # # asynchronous construction - # - # However, this breaks if any 'await' suspends our execution. For more - # information see... - # - # https://stackoverflow.com/questions/52783605/how-to-run-a-coroutine-outside… - - pass - - def start(self) -> None: - """ - Initiate resources to make this object callable from synchronous contexts. - """ - - with self._loop_lock: - if not self._no_op and self._loop is None: - self._loop = asyncio.new_event_loop() - self._loop_thread = threading.Thread( - name = '%s asyncio' % type(self).__name__, - target = self._loop.run_forever, - daemon = True, - ) - - self._loop_thread.start() - - def stop(self) -> None: - """ - Terminate resources that permits this from being callable from synchronous - contexts. Calling either :func:`~stem.util.Synchronous.start` or any async - method will resume us. - """ - - with self._loop_lock: - if not self._no_op and self._loop is not None: - self._loop.call_soon_threadsafe(self._loop.stop) - - if threading.current_thread() != self._loop_thread: - self._loop_thread.join() - - self._loop = None - self._loop_thread = None - - @staticmethod - def is_asyncio_context() -> bool: - """ - Check if running within a synchronous or asynchronous context. - - :returns: **True** if within an asyncio conext, **False** otherwise - """ - - try: - asyncio.get_running_loop() - return True - except RuntimeError: - return False - except AttributeError: - # TODO: drop when we remove python 3.6 support - - try: - return asyncio._get_running_loop() is not None - except AttributeError: - return False # python 3.5.3 or below - - def _run_async_method(self, method_name: str, *args: Any, **kwargs: Any) -> Any: - """ - Run this async method from either a synchronous or asynchronous context. - - :param method_name: name of the method to invoke - :param args: positional arguments - :param kwargs: keyword arguments - - :returns: method's return value - - :raises: **AttributeError** if this method doesn't exist - """ - - func = getattr(type(self), method_name, None) - - if not func: - raise AttributeError("'%s' does not have a %s method" % (type(self).__name__, method_name)) - elif self._no_op or Synchronous.is_asyncio_context(): - return func(self, *args, **kwargs) - - with self._loop_lock: - if self._loop is None: - Synchronous.start(self) - - # convert iterator if indicated by this method's name or type hint - - if method_name == '__aiter__' or (inspect.ismethod(func) and typing.get_type_hints(func).get('return') == AsyncIterator): - async def convert_generator(generator: AsyncIterator) -> Iterator: - return iter([d async for d in generator]) - - future = asyncio.run_coroutine_threadsafe(convert_generator(func(self, *args, **kwargs)), self._loop) - else: - future = asyncio.run_coroutine_threadsafe(func(self, *args, **kwargs), self._loop) - - return future.result() - - def __iter__(self) -> Iterator: - return self._run_async_method('__aiter__') - - def __enter__(self): - return self._run_async_method('__aenter__') - - def __exit__(self, exit_type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType]): - return self._run_async_method('__aexit__', exit_type, value, traceback) diff --git a/stem/util/asyncio.py b/stem/util/asyncio.py new file mode 100644 index 00000000..4ee8df3f --- /dev/null +++ b/stem/util/asyncio.py @@ -0,0 +1,238 @@ +# Copyright 2020, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Utilities for working with asyncio. +""" + +import asyncio +import functools +import inspect +import threading +import typing +import unittest.mock + +from types import TracebackType +from typing import Any, AsyncIterator, Iterator, Optional, Type + + +class Synchronous(object): + """ + Mixin that lets a class run within both synchronous and asynchronous + contexts. + + :: + + class Example(Synchronous): + async def hello(self): + return 'hello' + + def sync_demo(): + instance = Example() + print('%s from a synchronous context' % instance.hello()) + instance.stop() + + async def async_demo(): + instance = Example() + print('%s from an asynchronous context' % await instance.hello()) + instance.stop() + + sync_demo() + asyncio.run(async_demo()) + + Our async methods always run within a loop. For asyncio users this class has + no affect, but otherwise we transparently create an async context to run + within. + + Class initialization and any non-async methods should assume they're running + within an synchronous context. If our class supplies an **__ainit__()** + method it is invoked within our loop during initialization... + + :: + + class Example(Synchronous): + def __init__(self): + super(Example, self).__init__() + + # Synchronous part of our initialization. Avoid anything + # that must run within an asyncio loop. + + def __ainit__(self): + # Asychronous part of our initialization. You can call + # asyncio.get_running_loop(), and construct objects that + # require it (like asyncio.Queue and asyncio.Lock). + + Users are responsible for calling :func:`~stem.util.Synchronous.stop` when + finished to clean up underlying resources. + """ + + def __init__(self) -> None: + self._loop = None # type: Optional[asyncio.AbstractEventLoop] + self._loop_thread = None # type: Optional[threading.Thread] + self._loop_lock = threading.RLock() + + # this class is a no-op when created within an asyncio context + + self._no_op = Synchronous.is_asyncio_context() + + if self._no_op: + # TODO: replace with get_running_loop() when we remove python 3.6 support + + self._loop = asyncio.get_event_loop() + self.__ainit__() # this is already an asyncio context + else: + # Run coroutines through our loop. This calls methods by name rather than + # reference so runtime replacements (like mocks) work. + + for name, func in inspect.getmembers(self): + if name in ('__aiter__', '__aenter__', '__aexit__'): + pass # async object methods with synchronous counterparts + elif isinstance(func, unittest.mock.Mock) and inspect.iscoroutinefunction(func.side_effect): + setattr(self, name, functools.partial(self._run_async_method, name)) + elif inspect.ismethod(func) and inspect.iscoroutinefunction(func): + setattr(self, name, functools.partial(self._run_async_method, name)) + + Synchronous.start(self) + asyncio.run_coroutine_threadsafe(asyncio.coroutine(self.__ainit__)(), self._loop).result() + + def __ainit__(self): + """ + Implicitly called during construction. This method is assured to have an + asyncio loop during its execution. + """ + + # This method should be async (so 'await' works), but apparently that + # is not possible. + # + # When our object is constructed our __init__() can be called from a + # synchronous or asynchronous context. If synchronous, it's trivial to + # run an asynchronous variant of this method because we fully control + # the execution of our loop... + # + # asyncio.run_coroutine_threadsafe(self.__ainit__(), self._loop).result() + # + # However, when constructed from an asynchronous context the above will + # likely hang because our loop is already processing a task (namely, + # whatever is constructing us). While we can schedule a follow-up task, we + # cannot invoke it during our construction. + # + # Finally, when this method is simple we could directly invoke it... + # + # class Synchronous(object): + # def __init__(self): + # if Synchronous.is_asyncio_context(): + # try: + # self.__ainit__().send(None) + # except StopIteration: + # pass + # else: + # asyncio.run_coroutine_threadsafe(self.__ainit__(), self._loop).result() + # + # async def __ainit__(self): + # # asynchronous construction + # + # However, this breaks if any 'await' suspends our execution. For more + # information see... + # + # https://stackoverflow.com/questions/52783605/how-to-run-a-coroutine-outside… + + pass + + def start(self) -> None: + """ + Initiate resources to make this object callable from synchronous contexts. + """ + + with self._loop_lock: + if not self._no_op and self._loop is None: + self._loop = asyncio.new_event_loop() + self._loop_thread = threading.Thread( + name = '%s asyncio' % type(self).__name__, + target = self._loop.run_forever, + daemon = True, + ) + + self._loop_thread.start() + + def stop(self) -> None: + """ + Terminate resources that permits this from being callable from synchronous + contexts. Calling either :func:`~stem.util.Synchronous.start` or any async + method will resume us. + """ + + with self._loop_lock: + if not self._no_op and self._loop is not None: + self._loop.call_soon_threadsafe(self._loop.stop) + + if threading.current_thread() != self._loop_thread: + self._loop_thread.join() + + self._loop = None + self._loop_thread = None + + @staticmethod + def is_asyncio_context() -> bool: + """ + Check if running within a synchronous or asynchronous context. + + :returns: **True** if within an asyncio conext, **False** otherwise + """ + + try: + asyncio.get_running_loop() + return True + except RuntimeError: + return False + except AttributeError: + # TODO: drop when we remove python 3.6 support + + try: + return asyncio._get_running_loop() is not None + except AttributeError: + return False # python 3.5.3 or below + + def _run_async_method(self, method_name: str, *args: Any, **kwargs: Any) -> Any: + """ + Run this async method from either a synchronous or asynchronous context. + + :param method_name: name of the method to invoke + :param args: positional arguments + :param kwargs: keyword arguments + + :returns: method's return value + + :raises: **AttributeError** if this method doesn't exist + """ + + func = getattr(type(self), method_name, None) + + if not func: + raise AttributeError("'%s' does not have a %s method" % (type(self).__name__, method_name)) + elif self._no_op or Synchronous.is_asyncio_context(): + return func(self, *args, **kwargs) + + with self._loop_lock: + if self._loop is None: + Synchronous.start(self) + + # convert iterator if indicated by this method's name or type hint + + if method_name == '__aiter__' or (inspect.ismethod(func) and typing.get_type_hints(func).get('return') == AsyncIterator): + async def convert_generator(generator: AsyncIterator) -> Iterator: + return iter([d async for d in generator]) + + future = asyncio.run_coroutine_threadsafe(convert_generator(func(self, *args, **kwargs)), self._loop) + else: + future = asyncio.run_coroutine_threadsafe(func(self, *args, **kwargs), self._loop) + + return future.result() + + def __iter__(self) -> Iterator: + return self._run_async_method('__aiter__') + + def __enter__(self): + return self._run_async_method('__aenter__') + + def __exit__(self, exit_type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType]): + return self._run_async_method('__aexit__', exit_type, value, traceback) diff --git a/test/settings.cfg b/test/settings.cfg index ef543a18..e49835ea 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -258,7 +258,7 @@ test.unit_tests |test.unit.util.system.TestSystem |test.unit.util.term.TestTerminal |test.unit.util.tor_tools.TestTorTools -|test.unit.util.synchronous.TestSynchronous +|test.unit.util.asyncio.TestSynchronous |test.unit.util.__init__.TestBaseUtil |test.unit.installation.TestInstallation |test.unit.descriptor.descriptor.TestDescriptor diff --git a/test/unit/util/__init__.py b/test/unit/util/__init__.py index c29901b1..ffbc0bc4 100644 --- a/test/unit/util/__init__.py +++ b/test/unit/util/__init__.py @@ -9,6 +9,7 @@ import unittest from stem.util import datetime_to_unix __all__ = [ + 'asyncio', 'conf', 'connection', 'enum', diff --git a/test/unit/util/synchronous.py b/test/unit/util/asyncio.py similarity index 94% rename from test/unit/util/synchronous.py rename to test/unit/util/asyncio.py index 9485e09a..aef5c63f 100644 --- a/test/unit/util/synchronous.py +++ b/test/unit/util/asyncio.py @@ -1,5 +1,5 @@ """ -Unit tests for the stem.util.Synchronous class. +Unit tests for the stem.util.asyncio module. """ import asyncio @@ -8,7 +8,7 @@ import unittest from unittest.mock import patch, Mock -from stem.util import Synchronous +from stem.util.asyncio import Synchronous from stem.util.test_tools import coro_func_returning_value EXAMPLE_OUTPUT = """\ @@ -231,7 +231,7 @@ class TestSynchronous(unittest.TestCase): pre_constructed = Demo() - with patch('test.unit.util.synchronous.Demo.async_method', Mock(side_effect = coro_func_returning_value('mocked call'))): + with patch('test.unit.util.asyncio.Demo.async_method', Mock(side_effect = coro_func_returning_value('mocked call'))): post_constructed = Demo() self.assertEqual('mocked call', pre_constructed.async_method()) @@ -242,7 +242,7 @@ class TestSynchronous(unittest.TestCase): # synchronous methods are unaffected - with patch('test.unit.util.synchronous.Demo.sync_method', Mock(return_value = 'mocked call')): + with patch('test.unit.util.asyncio.Demo.sync_method', Mock(return_value = 'mocked call')): self.assertEqual('mocked call', pre_constructed.sync_method()) self.assertEqual('sync call', pre_constructed.sync_method())

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 25 Jul '20

25 Jul '20

commit b8b4a10916e7a794b6754534ff636341c17c849b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 25 22:47:42 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-ar.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tor-outreach2019-2020-ar.md b/tor-outreach2019-2020-ar.md index 2bfd6b4a36..7f8d3566e8 100644 --- a/tor-outreach2019-2020-ar.md +++ b/tor-outreach2019-2020-ar.md @@ -20,19 +20,19 @@ ### المستقبل هو سايبر نسوي -Fernanda runs a women's collective focused on reproductive rights in Brazil, where abortion is illegal. +تدير فرناندا جمعية نسائية تركز على الحقوق الإنجابية في البرازيل ، حيث الإجهاض غير قانوني. -Fernanda and her colleagues built a website with information about abortion access, birth control, and other resources for people seeking reproductive information. +أنشأت فرناندا وزملاؤها موقعًا إلكترونيًا يحتوي على معلومات حول الوصول إلى الإجهاض وتحديد النسل والموارد الأخرى للأشخاص الذين يبحثون عن المعلومات التناسلية. -If this website was linked back to them, they could be arrested--or worse. +إذا تم إعادة ربط هذا الموقع بهم ، فقد يتم القبض عليهم - أو ما هو أسوأ. -To protect themselves, Fernanda and her colleagues created the website using Tor **onion services**. Onion services not only protect them from being discovered as the operators of the server but also help protect visitors to their website by requiring they use Tor Browser. +لحماية أنفسهم ، أنشأت فرناندا وزملاؤها الموقع الإلكتروني باستخدام خدمات Tor ** onion **. لا تحميهم خدمات Onion من اكتشافهم كمشغلي الخادم فحسب ، بل تساعد أيضًا في حماية زوار موقعهم على الويب عن طريق اشتراطهم استخدام متصفح Tor. -In fact, Fernanda uses **Tor Browser** for all of her web browsing just to be on the safe side. +في الواقع ، تستخدم فرناندا ** متصفح ** ** لجميع تصفح الويب الخاص بها فقط لتكون في الجانب الآمن. -She also uses a Tor-powered app called **OnionShare** to send files to other activists securely and privately. +كما أنها تستخدم تطبيقًا يعمل بنظام Tor يسمى ** OnionShare ** لإرسال الملفات إلى نشطاء آخرين بأمان وخصوصية. -### Reproductive rights activists like Fernanda are fighting for fundamental freedoms, and Tor helps power their resistance. +### يناضل نشطاء الحقوق الإنجابية مثل فرناندا من أجل الحريات الأساسية ، ويساعد Tor في تعزيز مقاومتهم. --- @@ -46,15 +46,15 @@ She also uses a Tor-powered app called **OnionShare** to send files to other act لكن نهر Jelani اليوم مهدد من قبل الشركات المتعددة الجنسيات القوية التي تنقب عن النفط في المنطقة. -Private security firms, paid for by these companies, use powerful surveillance mechanisms to monitor the online activities of Jelani and his neighbors in the village who are organizing to protect their sacred river. +تستخدم شركات الأمن الخاصة ، التي تدفع لها هذه الشركات ، آليات مراقبة قوية لمراقبة أنشطة جيلاني وجيرانه على الإنترنت الذين ينظمون لحماية نهرهم المقدس. -Jelani uses **Tor Browser** to prevent these companies from watching as he visits websites for international human rights protection and legal aid and writes blog posts about the resistance movement in his village. +يستخدم جيلاني ** متصفح Tor ** لمنع هذه الشركات من المشاهدة وهو يزور مواقع لحماية حقوق الإنسان الدولية والمساعدة القانونية ويكتب منشورات مدونة عن حركة المقاومة في قريته. -He also uses **OnionShare** and **SecureDrop** to securely send documents to journalists who are helping expose these human rights violations. +كما أنه يستخدم ** OnionShare ** و ** SecureDrop ** لإرسال المستندات بشكل آمن إلى الصحفيين الذين يساعدون في فضح انتهاكات حقوق الإنسان هذه. -All of this software uses Tor to help protect Jelani’s privacy. +كل هذا البرنامج يستخدم Tor للمساعدة في حماية خصوصية الجيلاني. -### Human rights activists like Jelani are fighting for justice in their communities, and Tor helps power their resistance. +### يقاتل نشطاء حقوق الإنسان مثل جيلاني من أجل العدالة في مجتمعاتهم ، ويساعد Tor في تعزيز مقاومتهم. ---

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 25 Jul '20

25 Jul '20

commit addb71c345d6596adeeab3ce8412d5a796ccd016 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 25 18:17:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+he.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+he.po b/contents+he.po index ede28e7697..8938e63d42 100644 --- a/contents+he.po +++ b/contents+he.po @@ -4,6 +4,7 @@ # erinm, 2020 # Emma Peel, 2020 # ION, 2020 +# Omer, 2020 # msgid "" msgstr "" @@ -11,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-15 19:40+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: ION, 2020\n" +"Last-Translator: Omer, 2020\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -135,7 +136,7 @@ msgstr "" #: https//support.torproject.org/rpm/ (content/rpm/contents+en.lrtopic.title) msgid "Tor rpm packages" -msgstr "" +msgstr "חבילות rpm של Tor" #: https//support.torproject.org/abuse/ #: (content/abuse/contents+en.lrtopic.title) @@ -10049,11 +10050,11 @@ msgstr "האם Tor נמצא בשימוש או לא." #: templates/glossary.html:26 msgid "Contributors to item page:" -msgstr "" +msgstr "תורמים/ות לעמוד הפריט:" #: templates/glossary.html:28 msgid "Edit item page" -msgstr "" +msgstr "ערוך דף פריט" #: templates/glossary.html:29 templates/macros/question.html:19 #: templates/word.html:26

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 25 Jul '20

25 Jul '20

commit 6cd1154e8fd73b1da6ff7a72c350bbb106e13e32 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 25 18:17:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+he.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contents+he.po b/contents+he.po index 40bc44f827..18ad276228 100644 --- a/contents+he.po +++ b/contents+he.po @@ -1,3 +1,4 @@ +# # Translators: # zxcsd <jenisjpl(a)gmail.com>, 2019 # ereznet <support(a)ereznet.co.il>, 2019 @@ -5,6 +6,7 @@ # ido vasserman <itaizand(a)gmail.com>, 2019 # erinm, 2020 # ION, 2020 +# Omer, 2020 # msgid "" msgstr "" @@ -12,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: ION, 2020\n" +"Last-Translator: Omer, 2020\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -137,7 +139,7 @@ msgstr "תרום עכשיו" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Trademark" -msgstr "" +msgstr "סימן מסחרי" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" @@ -1001,7 +1003,7 @@ msgstr "" #: templates/download.html:10 msgid "Select \"Tor is censored in my country.\"" -msgstr "" +msgstr "בחר ב\"Tor מצונזר במדינה שלי\"." #: templates/download.html:13 msgid "" @@ -1023,7 +1025,7 @@ msgstr "הישאר בטוח" #: templates/download.html:23 msgid "Please do not torrent over Tor." -msgstr "" +msgstr "נא לא להעביר קבצי טורנט דרך Tor." #: templates/download.html:24 msgid ""

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40028'
by sysrqb＠torproject.org 25 Jul '20

25 Jul '20

commit 7737b940a9ce4e35cdb38b38b31b67adb5049d3b Merge: f60b9ea 2a9d74c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jul 25 16:18:25 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40028' projects/tor-browser/build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)

1 0

[tor-browser-build/master] Bug 40028: Do not reference unset env variables
by sysrqb＠torproject.org 25 Jul '20

25 Jul '20

commit 2a9d74cba72862ce3da57852958b3173927fb371 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 22 16:31:54 2020 +0000 Bug 40028: Do not reference unset env variables --- projects/tor-browser/build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 155a7bc..24c8265 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -121,14 +121,7 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files mkdir -p "$TBDIR/$DOCSPATH" cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" -[% IF c("var/namecoin") %] - EXCLUDE_ELECTRUM="" - EXCLUDE_NCPROP279="" -[% ELSE %] - EXCLUDE_ELECTRUM="--exclude=*Electrum-NMC*" - EXCLUDE_NCPROP279="--exclude=*ncprop279*" -[% END %] -tar -C Bundle-Data/[% bundledata_osname %] "${EXCLUDE_ELECTRUM}" "${EXCLUDE_NCPROP279}" -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x +tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" [% IF ! c("var/snowflake") %]

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 25 Jul '20

25 Jul '20

commit 8e33afc1b4f83579bb414a03f24138acfd896adf Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 25 08:46:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv.po b/sv.po index 0dc74476be..e84c501fd9 100644 --- a/sv.po +++ b/sv.po @@ -15,7 +15,7 @@ # Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2018-2020 # Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2017 # pilino1234 <pilino1234(a)zoho.eu>, 2016 -# miccav, 2014 +# 56de39dbda2b12eb73bb0082f99d9075_c272587, 2014 # ph AA, 2015 # phst, 2015 # 0848eda738c5b7991c82fe32ea145d37_6f8c5b1, 2014

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 25 Jul '20

25 Jul '20

commit 059190743afbb91f2e32eca9476fec325009a350 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 25 00:45:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/contents+es.po b/contents+es.po index ee8e271a43..a1b7ae3659 100644 --- a/contents+es.po +++ b/contents+es.po @@ -4724,11 +4724,13 @@ msgid "" "Manually managing MyFamily for big relay groups is error prone and can put " "Tor clients at risk." msgstr "" +"Manualmente gestionar MiFamilia en grandes grupos de transmisión es propenso" +" a errores y puede dejar a los clientes de Tor en riesgo." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 6. Optional: Limiting bandwidth usage (and traffic)" -msgstr "" +msgstr "# 6. Opcional: Limitar el uso de ancho de banda (y tráfico)" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4736,6 +4738,9 @@ msgid "" "Tor will not limit its bandwidth usage by default, but supports multiple " "ways to restrict the used bandwidth and the amount of traffic." msgstr "" +"Tor no va a limitar el uso de ancho de banda por defecto, pero permite " +"múltiples maneras de restringir el uso de ancho de banda y la cantidad de " +"tráfico. " #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4743,6 +4748,8 @@ msgid "" "This can be handy if you want to ensure that your Tor relay does not exceed " "a certain amount of bandwidth or total traffic per day/week/month." msgstr "" +"Esto puede ser muy útil si quieres asegurarte de que tu transmisión Tor no " +"se exceda el ancho de banda o el total de tráfico por día/semana/mes." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4750,36 +4757,38 @@ msgid "" "The following torrc configuration options can be used to restrict bandwidth " "and traffic:" msgstr "" +"La siguientes opciones configuración torrc pueden ser usadas para restringir" +" el uso del ancho de banda o el tráfico:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* AccountingMax" -msgstr "" +msgstr "* AccountingMax" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* AccountingRule" -msgstr "" +msgstr "* AccountingRule" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* AccountingStart" -msgstr "" +msgstr "* AccountingStart" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* BandwidthRate" -msgstr "" +msgstr "* BandwidthRate" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* BandwidthBurst" -msgstr "" +msgstr "* BandwidthBurst" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* RelayBandwidthRate" -msgstr "" +msgstr "* RelayBandwidthRate" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 25 Jul '20

25 Jul '20

commit 3b7bcd706cb6959edc5577579db4b0414da874e6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 25 00:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 5cfd07578b..ee8e271a43 100644 --- a/contents+es.po +++ b/contents+es.po @@ -4610,7 +4610,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 4. Configuration Management" -msgstr "" +msgstr "# 4. Gestor de Configuraciones" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4622,6 +4622,12 @@ msgid "" " without performing additional steps manually, you may want to use a " "configuration management for better maintainability." msgstr "" +"SI planeas correr mas de una transmisión, o quieres correr una transmisión " +"de alta capacidad (múltiples instancias Tor por servidor) o quieres usar " +"características de alta seguridad como [Llaves Maestras " +"Offline](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity…" +" sin hacer pasos adicionales, capas quieras utilizar el gestor de " +"configuraciones para un mejor mantenimiento." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4629,6 +4635,8 @@ msgid "" "There are multiple configuration management solutions for Unix based " "operating systems (Ansible, Puppet, Salt, ...)." msgstr "" +"Hay múltiples soluciones en el gestor de configuraciones para sistemas " +"operativos basados en Unix (Ansible, Puppet, Salt, ...)." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4637,11 +4645,14 @@ msgid "" "operators and supports multiple operating systems: [Ansible " "Relayor](http://github.com/nusenu/ansible-relayor)." msgstr "" +"El siguiente Ansible Role a sido específicamente creado para hacer " +"operaciones de transmisión Tor y puede ser usado en múltiples sistemas " +"operativos: [Ansible Relayor](http://github.com/nusenu/ansible-relayor). " #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 5. Important: if you run more than one Tor instance" -msgstr "" +msgstr "# 5. Importante: Si corres mas de una instancia Tor" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4652,6 +4663,12 @@ msgid "" "[ContactInfo](https://2019.www.torproject.org/docs/tor-" "manual.html.en#ContactInfo) in your torrc configuration." msgstr "" +"Para evitar poner los clientes Tor en riesgo cuando operes en múltiples " +"transmisiones debes establecer un adecuado " +"[MiFamilia](https://2019.www.torproject.org/docs/tor-" +"manual.html.en#MyFamily) valor y tener un valido " +"[InformacionDeContacto](https://2019.www.torproject.org/docs/tor-" +"manual.html.en#ContactInfo) en tu configuración torrc." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4660,6 +4677,10 @@ msgid "" "controlled by a single entity/operator/organization, so they are not used in" " multiple positions in a single circuit." msgstr "" +"La configuración MiFamilia simplemente esta diciendo a los clientes Tor que " +"las transmisiones están controladas por una sola " +"entidad/operador/organización, así no son usadas en múltiples posiciones en " +"un solo circuito." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4667,11 +4688,14 @@ msgid "" "If you run two relays and they have fingerprints AAAAAAAAAA and BBBBBBBB, " "you would add the following configuration to set MyFamily:" msgstr "" +"Si corres dos transmisiones y tienen las huellas digitales AAAAAAAAAA y " +"BBBBBBBB, deberías agregar la siguiente configuración para establecer " +"MiFamilia:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "MyFamily AAAAAAAAAA,BBBBBBBB" -msgstr "" +msgstr "MiFamilia AAAAAAAAAA,BBBBBBBB" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4680,6 +4704,9 @@ msgid "" "files when tor starts up or find the file named \"fingerprint\" in your tor " "DataDirectory." msgstr "" +"a las dos transmisiones. Para encontrar las huella digital tu puedes mirar " +"en los archivos de ingreso cuando se inicia tor o puedes encontrar el nombre" +" \"huella digital\" en tu DataDirectory (Director de Datos) de tor." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4687,6 +4714,9 @@ msgid "" "Instead of doing so manually for big operators we recommend to automate the " "MyFamily setting via a configuration management solution." msgstr "" +"En vez de hacerlo manualmente para los grandes operadores nosotros " +"recomendamos automatizar la configuración MiFamilia a través del gestor de " +"configuraciones." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body)

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 1087cd97b9ffa756f3a657189d0029691a66cefc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 23:47:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ar/torbutton.properties | 78 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/ar/torbutton.properties b/ar/torbutton.properties index d0899b76e4..b83f1d3755 100644 --- a/ar/torbutton.properties +++ b/ar/torbutton.properties @@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = بلد غير معروف # torbutton.circuit_display.guard = Guard # torbutton.circuit_display.guard_note = Your [Guard] node may not change. # torbutton.circuit_display.learn_more = Learn more +# torbutton.circuit_display.click_to_copy = Click to Copy +# torbutton.circuit_display.copied = Copied! # torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = انقر لتفعيل تور torbutton.panel.tooltip.enabled = انقر لتعطيل تور @@ -58,13 +60,85 @@ canvas.notNow=في وقت آخر # .Onion Page Info prompt. Strings are kept here for ease of translation. # pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) # pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +# pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. +# onionServices.learnMore=Learn more +# onionServices.errorPage.browser=Browser +# onionServices.errorPage.network=Network +# onionServices.errorPage.onionSite=Onionsite +# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with +# an error code, e.g., 0xF3. +# Tor SOCKS error 0xF0: +# onionServices.descNotFound.pageTitle=Problem Loading Onionsite +# onionServices.descNotFound.header=Onionsite Not Found +# onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +# onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +# Tor SOCKS error 0xF1: +# onionServices.descInvalid.pageTitle=Problem Loading Onionsite +# onionServices.descInvalid.header=Onionsite Cannot Be Reached +# onionServices.descInvalid=The onionsite is unreachable due an internal error. +# onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +# Tor SOCKS error 0xF2: +# onionServices.introFailed.pageTitle=Problem Loading Onionsite +# onionServices.introFailed.header=Onionsite Has Disconnected +# onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +# onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +# Tor SOCKS error 0xF3: +# onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +# onionServices.rendezvousFailed.header=Unable to Connect to Onionsite +# onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +# onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +# Tor SOCKS error 0xF4: +# onionServices.clientAuthMissing.pageTitle=Authorization Required +# onionServices.clientAuthMissing.header=Onionsite Requires Authentication +# onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +# onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +# Tor SOCKS error 0xF5: +# onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +# onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed +# onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +# onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +# Tor SOCKS error 0xF6: +# onionServices.badAddress.pageTitle=Problem Loading Onionsite +# onionServices.badAddress.header=Invalid Onionsite Address +# onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. +# onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +# Tor SOCKS error 0xF7: +# onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +# onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out +# onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +# onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +# # LOCALIZATION NOTE: %S will be replaced with the .onion address. -# onionServices.clientAuthMissing=Tor onion service missing client authorization -# onionServices.authPrompt.description=%S is requesting your private key. +# onionServices.authPrompt.description2=%S is requesting that you authenticate. # onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service # onionServices.authPrompt.done=Done # onionServices.authPrompt.doneAccessKey=d # onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) # onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +# onionServices.authPreferences.header=Onion Services Authentication +# onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +# onionServices.authPreferences.savedKeys=Saved Keys… +# onionServices.authPreferences.dialogTitle=Onion Service Keys +# onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +# onionServices.authPreferences.onionSite=Onionsite +# onionServices.authPreferences.onionKey=Key +# onionServices.authPreferences.remove=Remove +# onionServices.authPreferences.removeAll=Remove All +# onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +# onionServices.authPreferences.failedToRemoveKey=Unable to remove key + +# Onion-Location strings. +# onionLocation.alwaysPrioritize=Always Prioritize Onions +# onionLocation.alwaysPrioritizeAccessKey=a +# onionLocation.notNow=Not Now +# onionLocation.notNowAccessKey=n +# onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +# onionLocation.tryThis=Try Onion Services +# onionLocation.onionAvailable=.onion available +# onionLocation.learnMore=Learn more… +# onionLocation.always=Always +# onionLocation.askEverytime=Ask every time +# onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +# onionLocation.onionServicesTitle=Onion Services

1 0