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

[stem/master] Add temporary scripts for testing async communication with sockets
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit 89bc644ea55f1443e6bdc0279a401b9fef5f154a Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Sat Mar 14 22:05:15 2020 +0200 Add temporary scripts for testing async communication with sockets --- test_control_port.py | 30 ++++++++++++++++++++++++++++++ test_control_socket_file.py | 30 ++++++++++++++++++++++++++++++ test_relay_socket.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) diff --git a/test_control_port.py b/test_control_port.py new file mode 100644 index 00000000..85fe26d4 --- /dev/null +++ b/test_control_port.py @@ -0,0 +1,30 @@ +import asyncio + +from stem.async_socket import ControlPort + + +async def run_command(i, command): + async with ControlPort() as cp: + print(f'{i} Connecting') + await cp.connect() + print(f'{i} Authenticating') + await cp.send('AUTHENTICATE "password"') + print(f'{i} Receiving auth message') + await cp.recv() + print(f'{i} Sending the command') + await cp.send(command) + print(f'{i} Receiving result of the command') + result = await cp.recv() + print(f'{i} {result.content()}') + + +if __name__ == '__main__': + loop = asyncio.get_event_loop() + tasks = asyncio.gather( + run_command(1, 'PROTOCOLINFO 1'), + run_command(2, 'GETINFO traffic/read'), + ) + try: + loop.run_until_complete(tasks) + finally: + loop.close() diff --git a/test_control_socket_file.py b/test_control_socket_file.py new file mode 100644 index 00000000..4c6816f4 --- /dev/null +++ b/test_control_socket_file.py @@ -0,0 +1,30 @@ +import asyncio + +from stem.async_socket import ControlSocketFile + + +async def run_command(i, command): + async with ControlSocketFile() as cp: + print(f'{i} Connecting') + await cp.connect() + print(f'{i} Authenticating') + await cp.send('AUTHENTICATE "password"') + print(f'{i} Receiving auth message') + await cp.recv() + print(f'{i} Sending the command') + await cp.send(command) + print(f'{i} Receiving result of the command') + result = await cp.recv() + print(f'{i} {result.content()}') + + +if __name__ == '__main__': + loop = asyncio.get_event_loop() + tasks = asyncio.gather( + run_command(1, 'PROTOCOLINFO 1'), + run_command(2, 'GETINFO traffic/read'), + ) + try: + loop.run_until_complete(tasks) + finally: + loop.close() diff --git a/test_relay_socket.py b/test_relay_socket.py new file mode 100644 index 00000000..76289d46 --- /dev/null +++ b/test_relay_socket.py @@ -0,0 +1,28 @@ +import asyncio + +from stem.client import DEFAULT_LINK_PROTOCOLS +from stem.client.cell import VersionsCell +from stem.async_socket import RelaySocket + + +async def run_command(i, command): + async with RelaySocket(address='127.0.0.1', port=443) as cp: + print(f'{i} Connecting') + await cp.connect() + print(f'{i} Sending the command') + await cp.send(command) + print(f'{i} Receiving result of the command') + result = await cp.recv(2) + print(result) + + +if __name__ == '__main__': + loop = asyncio.get_event_loop() + tasks = asyncio.gather( + run_command(1, VersionsCell(DEFAULT_LINK_PROTOCOLS).pack(2)), + run_command(2, VersionsCell(DEFAULT_LINK_PROTOCOLS).pack(2)), + ) + try: + loop.run_until_complete(tasks) + finally: + loop.close()

1 0

[stem/master] Start using asyncio in "stem/async_socket.py"
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit 0f727a91abb27e487fad49794a428f78e1582f31 Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Sat Mar 14 22:01:22 2020 +0200 Start using asyncio in "stem/async_socket.py" --- stem/async_socket.py | 175 ++++++++++++++++++--------------------------------- 1 file changed, 62 insertions(+), 113 deletions(-) diff --git a/stem/async_socket.py b/stem/async_socket.py index 2ef42dd5..512e6bde 100644 --- a/stem/async_socket.py +++ b/stem/async_socket.py @@ -72,6 +72,7 @@ Tor... from __future__ import absolute_import +import asyncio import re import socket import ssl @@ -97,7 +98,8 @@ class BaseSocket(object): """ def __init__(self): - self._socket, self._socket_file = None, None + self._reader = None + self._writer = None self._is_alive = False self._connection_time = 0.0 # time when we last connected or disconnected @@ -151,7 +153,7 @@ class BaseSocket(object): return self._connection_time - def connect(self): + async def connect(self): """ Connects to a new socket, closing our previous one if we're already attached. @@ -165,11 +167,10 @@ class BaseSocket(object): # calls no longer block (raising SocketClosed instead). if self.is_alive(): - self.close() + await self.close() with self._recv_lock: - self._socket = self._make_socket() - self._socket_file = self._socket.makefile(mode = 'rwb') + self._reader, self._writer = await self._open_connection() self._is_alive = True self._connection_time = time.time() @@ -179,11 +180,11 @@ class BaseSocket(object): # It's safe to retry, so give it another try if it fails. try: - self._connect() + await self._connect() except stem.SocketError: - self._connect() # single retry + await self._connect() # single retry - def close(self): + async def close(self): """ Shuts down the socket. If it's already closed then this is a no-op. """ @@ -194,32 +195,21 @@ class BaseSocket(object): is_change = self.is_alive() - if self._socket: - # if we haven't yet established a connection then this raises an error - # socket.error: [Errno 107] Transport endpoint is not connected + if self._writer: + self._writer.close() + # `StreamWriter.wait_closed` was added in Python 3.7. + if hasattr(self._writer, 'wait_closed'): + await self._writer.wait_closed() - try: - self._socket.shutdown(socket.SHUT_RDWR) - except socket.error: - pass - - self._socket.close() - - if self._socket_file: - try: - self._socket_file.close() - except BrokenPipeError: - pass - - self._socket = None - self._socket_file = None + self._reader = None + self._writer = None self._is_alive = False self._connection_time = time.time() if is_change: - self._close() + await self._close() - def _send(self, message, handler): + async def _send(self, message, handler): """ Send message in a thread safe manner. Handler is expected to be of the form... @@ -233,17 +223,17 @@ class BaseSocket(object): if not self.is_alive(): raise stem.SocketClosed() - handler(self._socket, self._socket_file, message) + await handler(self._writer, message) except stem.SocketClosed: # if send_message raises a SocketClosed then we should properly shut # everything down if self.is_alive(): - self.close() + await self.close() raise - def _recv(self, handler): + async def _recv(self, handler): """ Receives a message in a thread safe manner. Handler is expected to be of the form... @@ -254,15 +244,15 @@ class BaseSocket(object): with self._recv_lock: try: - # makes a temporary reference to the _socket_file because connect() + # makes a temporary reference to the _reader because connect() # and close() may set or unset it - my_socket, my_socket_file = self._socket, self._socket_file + my_reader = self._reader - if not my_socket or not my_socket_file: + if not my_reader: raise stem.SocketClosed() - return handler(my_socket, my_socket_file) + return await handler(my_reader) except stem.SocketClosed: # If recv_message raises a SocketClosed then we should properly shut # everything down. However, there's a couple cases where this will @@ -280,7 +270,7 @@ class BaseSocket(object): if self.is_alive(): if self._send_lock.acquire(False): - self.close() + await self.close() self._send_lock.release() raise @@ -298,37 +288,27 @@ class BaseSocket(object): return self._send_lock - def __enter__(self): + async def __aenter__(self): return self - def __exit__(self, exit_type, value, traceback): - self.close() + async def __aexit__(self, exit_type, value, traceback): + await self.close() - def _connect(self): + async def _connect(self): """ Connection callback that can be overwritten by subclasses and wrappers. """ pass - def _close(self): + async def _close(self): """ Disconnection callback that can be overwritten by subclasses and wrappers. """ pass - def _make_socket(self): - """ - Constructs and connects new socket. This is implemented by subclasses. - - :returns: **socket.socket** for our configuration - - :raises: - * :class:`stem.SocketError` if unable to make a socket - * **NotImplementedError** if not implemented by a subclass - """ - + async def _open_connection(self): raise NotImplementedError('Unsupported Operation: this should be implemented by the BaseSocket subclass') @@ -344,26 +324,19 @@ class RelaySocket(BaseSocket): :var int port: ORPort our socket connects to """ - def __init__(self, address = '127.0.0.1', port = 9050, connect = True): + def __init__(self, address = '127.0.0.1', port = 9050): """ RelaySocket constructor. :param str address: ip address of the relay :param int port: orport of the relay - :param bool connect: connects to the socket if True, leaves it unconnected otherwise - - :raises: :class:`stem.SocketError` if connect is **True** and we're - unable to establish a connection """ super(RelaySocket, self).__init__() self.address = address self.port = port - if connect: - self.connect() - - def send(self, message): + async def send(self, message): """ Sends a message to the relay's ORPort. @@ -374,9 +347,9 @@ class RelaySocket(BaseSocket): * :class:`stem.SocketClosed` if the socket is known to be shut down """ - self._send(message, lambda s, sf, msg: _write_to_socket(sf, msg)) + await self._send(message, _write_to_socket) - def recv(self, timeout = None): + async def recv(self, timeout = None): """ Receives a message from the relay. @@ -390,30 +363,24 @@ class RelaySocket(BaseSocket): * :class:`stem.SocketClosed` if the socket closes before we receive a complete message """ - def wrapped_recv(s, sf): + async def wrapped_recv(reader): + read_coroutine = reader.read(1024) if timeout is None: - return s.recv() + return await read_coroutine else: - s.setblocking(0) - s.settimeout(timeout) - try: - return s.recv() - except (socket.timeout, ssl.SSLError, ssl.SSLWantReadError): + return await asyncio.wait_for(read_coroutine, timeout) + except (asyncio.TimeoutError, ssl.SSLError, ssl.SSLWantReadError): return None - finally: - s.setblocking(1) - return self._recv(wrapped_recv) + return await self._recv(wrapped_recv) def is_localhost(self): return self.address == '127.0.0.1' - def _make_socket(self): + async def _open_connection(self): try: - relay_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - relay_socket.connect((self.address, self.port)) - return ssl.wrap_socket(relay_socket) + return await asyncio.open_connection(self.address, self.port, ssl=ssl.SSLContext()) except socket.error as exc: raise stem.SocketError(exc) @@ -431,7 +398,7 @@ class ControlSocket(BaseSocket): def __init__(self): super(ControlSocket, self).__init__() - def send(self, message): + async def send(self, message): """ Formats and sends a message to the control socket. For more information see the :func:`~stem.socket.send_message` function. @@ -443,9 +410,9 @@ class ControlSocket(BaseSocket): * :class:`stem.SocketClosed` if the socket is known to be shut down """ - self._send(message, lambda s, sf, msg: send_message(sf, msg)) + await self._send(message, send_message) - def recv(self): + async def recv(self): """ Receives a message from the control socket, blocking until we've received one. For more information see the :func:`~stem.socket.recv_message` function. @@ -457,7 +424,7 @@ class ControlSocket(BaseSocket): * :class:`stem.SocketClosed` if the socket closes before we receive a complete message """ - return self._recv(lambda s, sf: recv_message(sf)) + return await self._recv(recv_message) class ControlPort(ControlSocket): @@ -469,33 +436,24 @@ class ControlPort(ControlSocket): :var int port: ControlPort our socket connects to """ - def __init__(self, address = '127.0.0.1', port = 9051, connect = True): + def __init__(self, address = '127.0.0.1', port = 9051): """ ControlPort constructor. :param str address: ip address of the controller :param int port: port number of the controller - :param bool connect: connects to the socket if True, leaves it unconnected otherwise - - :raises: :class:`stem.SocketError` if connect is **True** and we're - unable to establish a connection """ super(ControlPort, self).__init__() self.address = address self.port = port - if connect: - self.connect() - def is_localhost(self): return self.address == '127.0.0.1' - def _make_socket(self): + async def _open_connection(self): try: - control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - control_socket.connect((self.address, self.port)) - return control_socket + return await asyncio.open_connection(self.address, self.port) except socket.error as exc: raise stem.SocketError(exc) @@ -508,36 +466,27 @@ class ControlSocketFile(ControlSocket): :var str path: filesystem path of the socket we connect to """ - def __init__(self, path = '/var/run/tor/control', connect = True): + def __init__(self, path = '/var/run/tor/control'): """ ControlSocketFile constructor. :param str socket_path: path where the control socket is located - :param bool connect: connects to the socket if True, leaves it unconnected otherwise - - :raises: :class:`stem.SocketError` if connect is **True** and we're - unable to establish a connection """ super(ControlSocketFile, self).__init__() self.path = path - if connect: - self.connect() - def is_localhost(self): return True - def _make_socket(self): + async def _open_connection(self): try: - control_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - control_socket.connect(self.path) - return control_socket + return await asyncio.open_unix_connection(self.path) except socket.error as exc: raise stem.SocketError(exc) -def send_message(control_file, message, raw = False): +async def send_message(writer, message, raw = False): """ Sends a message to the control socket, adding the expected formatting for single verses multi-line messages. Neither message type should contain an @@ -572,7 +521,7 @@ def send_message(control_file, message, raw = False): if not raw: message = send_formatting(message) - _write_to_socket(control_file, message) + await _write_to_socket(writer, message) if log.is_tracing(): log_message = message.replace('\r\n', '\n').rstrip() @@ -580,10 +529,10 @@ def send_message(control_file, message, raw = False): log.trace('Sent to tor:%s%s' % (msg_div, log_message)) -def _write_to_socket(socket_file, message): +async def _write_to_socket(writer, message): try: - socket_file.write(stem.util.str_tools._to_bytes(message)) - socket_file.flush() + writer.write(stem.util.str_tools._to_bytes(message)) + await writer.drain() except socket.error as exc: log.info('Failed to send: %s' % exc) @@ -603,7 +552,7 @@ def _write_to_socket(socket_file, message): raise stem.SocketClosed('file has been closed') -def recv_message(control_file, arrived_at = None): +async def recv_message(reader, arrived_at = None): """ Pulls from a control socket until we either have a complete message or encounter a problem. @@ -623,7 +572,7 @@ def recv_message(control_file, arrived_at = None): while True: try: - line = control_file.readline() + line = await reader.readline() except AttributeError: # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' @@ -689,7 +638,7 @@ def recv_message(control_file, arrived_at = None): while True: try: - line = control_file.readline() + line = await reader.readline() raw_content += line except socket.error as exc: log.info(ERROR_MSG % ('SocketClosed', 'received an exception while mid-way through a data reply (exception: "%s", read content: "%s")' % (exc, log.escape(bytes(raw_content)))))

1 0

[bridgedb/develop] Merge branch 'master' into 'develop'
by phw＠torproject.org 15 Jul '20

15 Jul '20

commit 8e7c77a6c1455793e2a127a4214d739b313f88e6 Merge: bd8b379 886f396 Author: Philipp Winter <phw(a)torproject.org> Date: Wed Jul 15 21:35:47 2020 +0000 Merge branch 'master' into 'develop' Update bridgedb-metrics spec to align with version 2 of the metrics format and... See merge request tpo/anti-censorship/bridgedb!9 doc/bridgedb-metrics-spec.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)

1 0

[bridgedb/develop] Align bridgedb-metrics spec with latest format.
by phw＠torproject.org 15 Jul '20

15 Jul '20

commit 886f3969154fdf17d50637aee751276bae34483c Author: hanneloresx <hanneloresx(a)protonmail.com> Date: Sun Jul 12 21:54:33 2020 -0400 Align bridgedb-metrics spec with latest format. Update bridgedb-metrics spec to align with version 2 of the metrics format and provide more information on internal metrics. --- doc/bridgedb-metrics-spec.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/bridgedb-metrics-spec.txt b/doc/bridgedb-metrics-spec.txt index aac838a..9a51926 100644 --- a/doc/bridgedb-metrics-spec.txt +++ b/doc/bridgedb-metrics-spec.txt @@ -25,10 +25,10 @@ file is formatted as follows: VERSION determines the version of the metrics format. As the format changes over time, we will increment VERSION. The latest - version is 1 -- the first iteration of the metrics format. + version is 2 -- the second iteration of the metrics format. Example: - bridgedb-metrics-version 1 + bridgedb-metrics-version 2 "bridgedb-metric-count" METRIC_KEY COUNT NL [Any number.] @@ -75,11 +75,16 @@ file is formatted as follows: Strings in between quotes (e.g., "handouts") are literals and show up in the hierarchy as is. Upper-case strings (e.g., TRANSPORT) are - placeholders, which are explained below. + placeholders, which are explained below. The internal.handouts + metrics provide statistics on how often a given bridge was handed out + during the measurement interval. Bridges that were not handed out will + not be part of these metrics. TRANSPORT refers to a pluggable transport protocol. This includes "obfs2", "obfs3", "obfs4", "scramblesuit", and "fte". These - pluggable transports will change in the future. + pluggable transports will change in the future. This field also includes + "unallocated" when reporting internal metrics to report on bridges left + unallocated as configured. CC refers to a two-letter country code of the user's IP address. We use two reserved country codes, "??" and "zz". "??" denotes that we couldn't @@ -91,6 +96,9 @@ file is formatted as follows: The field RESERVED is reserved for an anomaly score. It is currently set to "none" and should be ignored by implementations. + + SUBRING refers to a subring of a hashring that bridges are arranged into + during distribution. COUNT is the approximate number of user requests for the given METRIC_KEY. We round up the number of requests to the next

1 0

[community/master] Refine Windows bridge instructions
by phw＠torproject.org 15 Jul '20

15 Jul '20

commit 25f93cb11a266b8feab6498e753b89ed20008065 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Jul 15 00:35:17 2020 +0000 Refine Windows bridge instructions --- content/relay-operations/technical-setup/bridge/windows/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/windows/contents.lr b/content/relay-operations/technical-setup/bridge/windows/contents.lr index 8de2601..7bf3ddc 100644 --- a/content/relay-operations/technical-setup/bridge/windows/contents.lr +++ b/content/relay-operations/technical-setup/bridge/windows/contents.lr @@ -16,7 +16,7 @@ body: * [Windows Expert Bundle](https://www.torproject.org/download/tor/). Unzip the contents on the desktop. -* [Tor Browser](https://www.torproject.org/download/#windows). Run the `.exe` and install with default settings. +* [Tor Browser (version depends on your computer)](https://www.torproject.org/download/languages/) Run the `.exe` and install with default settings. You will need to show hidden items and file name extensions. In your Explorer window, in the top-left, click on the View tab. In the Show/hide section furthest to the right, check the checkbox for Hidden items; check the checkbox for File name extensions.

1 0

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

15 Jul '20

commit 7e2383b5162e1d786dcbfb434c3f8739c5b6b669 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 15 16:48:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index c714aaac18..d34da74c68 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -9,6 +9,7 @@ # Towinet, 2020 # Emma Peel, 2020 # AO <ao(a)localizationlab.org>, 2020 +# a a, 2020 # msgid "" msgstr "" @@ -16,7 +17,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: AO <ao(a)localizationlab.org>, 2020\n" +"Last-Translator: a a, 2020\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5519,6 +5520,8 @@ msgid "" "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-" "onion-browser-and-more-ios-tor)." msgstr "" +"[En savoir plus sur Onion Browser](https://blog.torproject.org/tor-heart-" +"onion-browser-and-more-ios-tor)." #: https//support.torproject.org/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description) @@ -5526,6 +5529,8 @@ msgid "" "Download Onion Browser from the [App Store](https://itunes.apple.com/us/app" "/onion-browser/id519296448)." msgstr "" +"Téléchargez Onion Browser sur l'[App Store] (https://itunes.apple.com/us/app" +"/onion-browser/id519296448)." #: https//support.torproject.org/tormobile/tormobile-4/ #: (content/tormobile/tormobile-4/contents+en.lrquestion.title)

1 0

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

15 Jul '20

commit b170a4884f93dcb07f523985b7dc02794238dc54 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 15 16:47:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 4866dcdab3..0a1419c830 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3348,18 +3348,18 @@ msgid "" msgstr "" "Consultez [notre portail de support] " "(https://support.torproject.org/tormobile/tormobile-6/) pour savoir si vous " -"avez besoin des deux navigateurs Tor pour Android et Orbot ou de l'un ou " -"l'autre" +"avez besoin à la fois du navigateur Tor pour Android et d'Orbot, ou de l'un " +"des deux." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### Tor Browser for iOS" -msgstr "" +msgstr "### Tor Browser pour iOS" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "There is no Tor Browser for iOS." -msgstr "" +msgstr "Il n'y a pas de navigateur Tor pour iOS." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3390,6 +3390,8 @@ msgid "" "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-" "onion-browser-and-more-ios-tor)." msgstr "" +"[En savoir plus sur Onion Browser](https://blog.torproject.org/tor-heart-" +"onion-browser-and-more-ios-tor)." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3397,11 +3399,13 @@ msgid "" "Download Onion Browser from the [App Store](https://itunes.apple.com/us/app" "/onion-browser/id519296448)." msgstr "" +"Téléchargez Onion Browser sur l'[App Store] (https://itunes.apple.com/us/app" +"/onion-browser/id519296448)." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### Tor Browser for Windows Phone" -msgstr "" +msgstr "### Navigateur Tor pour Windows Phone" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

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

15 Jul '20

commit e9bc2084c295731829abb95f3b184ca16c9edcaa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 15 16:17:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- pa-IN/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pa-IN/browserOnboarding.properties b/pa-IN/browserOnboarding.properties index 3ec5784441..c63d73e765 100644 --- a/pa-IN/browserOnboarding.properties +++ b/pa-IN/browserOnboarding.properties @@ -56,7 +56,7 @@ onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity onboarding.tour-tor-toolbar-update-9.0.next-button=Go to Tor Network # Circuit Display onboarding. -onboarding.tor-circuit-display.next=Next +onboarding.tor-circuit-display.next=ਅੱਗੇ onboarding.tor-circuit-display.done=ਮੁਕੰਮਲ onboarding.tor-circuit-display.one-of-three=1 of 3 onboarding.tor-circuit-display.two-of-three=2 of 3

1 0

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

15 Jul '20

commit 51c4c03689cb9d57b04f3b2c8eb11bf16ec25ca4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 15 16:17:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- pa-IN/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pa-IN/torbutton.properties b/pa-IN/torbutton.properties index 23e67a06c1..7cc0e3d45c 100644 --- a/pa-IN/torbutton.properties +++ b/pa-IN/torbutton.properties @@ -123,7 +123,7 @@ 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.onionKey=ਕੁੰਜੀ onionServices.authPreferences.remove=Remove onionServices.authPreferences.removeAll=Remove All onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor

1 0

[translation/tor-and-https] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https
by translation＠torproject.org 15 Jul '20

15 Jul '20

commit 36faf664e7c2880aeaab678996982c4442e09d98 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 15 16:17:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https --- pa.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pa.po b/pa.po index 39b30f1bc1..f8b6689089 100644 --- a/pa.po +++ b/pa.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" +"PO-Revision-Date: 2020-07-15 16:09+0000\n" +"Last-Translator: A S Alam <alam.yellow(a)gmail.com>\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -114,7 +114,7 @@ msgstr "" #: C/tor-and-https.svg:363 #, no-wrap msgid "Key" -msgstr "" +msgstr "ਕੁੰਜੀ" #. (itstool) path: defs/text #: C/tor-and-https.svg:363

1 0