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

[sbws/master] scanner, destination: Log all possible exceptions
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit c4f502c1d05570d6069680b3a91cf9a1709d6e7a Author: juga0 <juga(a)riseup.net> Date: Wed Feb 27 17:30:59 2019 +0000 scanner, destination: Log all possible exceptions that can happen from requests, so that they can later be stored in a Result. --- sbws/core/scanner.py | 8 ++------ sbws/lib/destination.py | 5 +---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index e99b8cd..3fbd378 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -84,8 +84,6 @@ def timed_recv_from_server(session, dest, byte_range): start_time = time.time() HTTP_GET_HEADERS['Range'] = byte_range - # TODO: - # - What other exceptions can this throw? # - response.elapsed "measures the time taken between sending the first # byte of the request and finishing parsing the headers. # It is therefore unaffected by consuming the response content" @@ -94,10 +92,8 @@ def timed_recv_from_server(session, dest, byte_range): try: # headers are merged with the session ones, not overwritten. session.get(dest.url, headers=HTTP_GET_HEADERS, verify=dest.verify) - # NewConnectionError will be raised when shutting down. - except (requests.exceptions.ConnectionError, - requests.exceptions.ReadTimeout, - requests.exceptions.NewConnectionError) as e: + # Catch any `requests` exception, so that it can stored in the Result + except requests.exceptions.RequestException as e: log.debug(e) return False, e end_time = time.time() diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index e1be0bb..c0e6b03 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -76,11 +76,8 @@ def connect_to_destination_over_circuit(dest, circ_id, session, cont, max_dl): listener = stem_utils.attach_stream_to_circuit_listener(cont, circ_id) stem_utils.add_event_listener(cont, listener, EventType.STREAM) try: - # TODO: - # - What other exceptions can this throw? head = session.head(dest.url, verify=dest.verify) - except (requests.exceptions.ConnectionError, - requests.exceptions.ReadTimeout) as e: + except requests.exceptions.RequestException as e: dest.set_failure() return False, 'Could not connect to {} over circ {} {}: {}'.format( dest.url, circ_id, stem_utils.circuit_str(cont, circ_id), e)

1 0

[sbws/master] scanner: Substitute log message with constant
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 8bd615434f5416cb0d0a9ce34defb14011d97810 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 27 17:05:38 2019 +0000 scanner: Substitute log message with constant when dumping stack. --- sbws/core/scanner.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index a1206d3..06bae72 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -60,9 +60,7 @@ signal.signal(signal.SIGTERM, stop_threads) def dumpstacks(): import traceback - log.critical("sbws stop measuring relays, probably because of a bug." - "Please, open a ticket in trac.torproject.org with this" - "backtrace.") + log.critical(FILLUP_TICKET_MSG) thread_id2name = dict([(t.ident, t.name) for t in threading.enumerate()]) for thread_id, stack in sys._current_frames().items(): log.critical("Thread: %s(%d)",

1 0

[sbws/master] destination: add function to parse countries
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit fe281909a5705cd9ab17daf57ae4ec179719572f Author: juga0 <juga(a)riseup.net> Date: Mon Feb 11 10:50:04 2019 +0000 destination: add function to parse countries so that they can be reported in the bandwidth file headers. --- sbws/lib/destination.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index c0e6b03..a92df61 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -12,6 +12,26 @@ from ..globals import MAXIMUM_NUMBER_DESTINATION_FAILURES log = logging.getLogger(__name__) +# Duplicate some code from DestinationList.from_config, +# it should be refactored. +def parse_destinations_countries(conf): + """Returns the destinations' country as string separated by comma. + + """ + destinations_countries = [] + for key in conf['destinations'].keys(): + # Not a destination key + if key in ['usability_test_interval']: + continue + # The destination is not enabled + if not conf['destinations'].getboolean(key): + continue + destination_section = 'destinations.{}'.format(key) + destination_country = conf[destination_section].get('country', None) + destinations_countries.append(destination_country) + return ','.join(destinations_countries) + + def _parse_verify_option(conf_section): if 'verify' not in conf_section: return DESTINATION_VERIFY_CERTIFICATE

1 0

[sbws/master] v3bwfile: Include scanner country in the headers
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 6fc0810a5f9c0e54d20605bdb122a2b709ce6c19 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 6 12:57:18 2019 +0000 v3bwfile: Include scanner country in the headers --- sbws/core/generate.py | 6 ++++-- sbws/lib/v3bwfile.py | 12 ++++++++---- tests/unit/lib/test_v3bwfile.py | 7 +++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index df86029..c022b5b 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -104,8 +104,10 @@ def main(args, conf): state_fpath = conf.getpath('paths', 'state_fname') consensus_path = os.path.join(conf.getpath('tor', 'datadir'), "cached-consensus") - bw_file = V3BWFile.from_results(results, state_fpath, args.scale_constant, - scaling_method, + # Accept None as scanner_country to be compatible with older versions. + scanner_country = conf['scanner'].get('country') + bw_file = V3BWFile.from_results(results, scanner_country, state_fpath, + args.scale_constant, scaling_method, torflow_cap=args.torflow_bw_margin, round_digs=args.round_digs, secs_recent=args.secs_recent, diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 8cb9226..b0ab385 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -28,7 +28,8 @@ KEYVALUE_SEP_V1 = '=' KEYVALUE_SEP_V2 = ' ' # List of the extra KeyValues accepted by the class EXTRA_ARG_KEYVALUES = ['software', 'software_version', 'file_created', - 'earliest_bandwidth', 'generator_started'] + 'earliest_bandwidth', 'generator_started', + 'scanner_country'] STATS_KEYVALUES = ['number_eligible_relays', 'minimum_number_eligible_relays', 'number_consensus_relays', 'percent_eligible_relays', 'minimum_percent_eligible_relays'] @@ -140,7 +141,7 @@ class V3BWHeader(object): return self.strv2 @classmethod - def from_results(cls, results, state_fpath=''): + def from_results(cls, results, scanner_country=None, state_fpath=''): kwargs = dict() latest_bandwidth = cls.latest_bandwidth_from_results(results) earliest_bandwidth = cls.earliest_bandwidth_from_results(results) @@ -150,6 +151,9 @@ class V3BWHeader(object): kwargs['earliest_bandwidth'] = unixts_to_isodt_str(earliest_bandwidth) if generator_started is not None: kwargs['generator_started'] = generator_started + # To be compatible with older bandwidth files, do not require it. + if scanner_country is not None: + kwargs['scanner_country'] = scanner_country h = cls(timestamp, **kwargs) return h @@ -524,7 +528,7 @@ class V3BWFile(object): for bw_line in self.bw_lines]) @classmethod - def from_results(cls, results, state_fpath='', + def from_results(cls, results, scanner_country=None, state_fpath='', scale_constant=SBWS_SCALE_CONSTANT, scaling_method=TORFLOW_SCALING, torflow_obs=TORFLOW_OBS_LAST, @@ -551,7 +555,7 @@ class V3BWFile(object): """ log.info('Processing results to generate a bandwidth list file.') - header = V3BWHeader.from_results(results, state_fpath) + header = V3BWHeader.from_results(results, scanner_country, state_fpath) bw_lines_raw = [] number_consensus_relays = cls.read_number_consensus_relays( consensus_path) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 2d38f48..506f63b 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -16,6 +16,8 @@ from sbws.util.timestamp import now_fname, now_isodt_str, now_unixts timestamp = 1523974147 timestamp_l = str(timestamp) version_l = KEYVALUE_SEP_V1.join(['version', SPEC_VERSION]) +scanner_country = 'US' +scanner_country_l = KEYVALUE_SEP_V1.join(['scanner_country', scanner_country]) software_l = KEYVALUE_SEP_V1.join(['software', 'sbws']) software_version_l = KEYVALUE_SEP_V1.join(['software_version', version]) file_created = '2018-04-25T13:10:57' @@ -24,7 +26,7 @@ latest_bandwidth = '2018-04-17T14:09:07' latest_bandwidth_l = KEYVALUE_SEP_V1.join(['latest_bandwidth', latest_bandwidth]) header_ls = [timestamp_l, version_l, file_created_l, latest_bandwidth_l, - software_l, software_version_l, TERMINATOR] + scanner_country_l, software_l, software_version_l, TERMINATOR] header_str = LINE_SEP.join(header_ls) + LINE_SEP earliest_bandwidth = '2018-04-16T14:09:07' earliest_bandwidth_l = KEYVALUE_SEP_V1.join(['earliest_bandwidth', @@ -53,7 +55,8 @@ v3bw_str = header_extra_str + raw_bwl_str def test_v3bwheader_str(): """Test header str""" - header = V3BWHeader(timestamp_l, file_created=file_created) + header = V3BWHeader(timestamp_l, scanner_country=scanner_country, + file_created=file_created) assert header_str == str(header)

1 0

[sbws/master] tests: Add country to the user configuration
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 878e21e36b6e0def6e348fcd0127d20d72e24bd8 Author: juga0 <juga(a)riseup.net> Date: Tue Feb 26 07:05:52 2019 +0000 tests: Add country to the user configuration used to run the scanner. The test that runs the scanner was introduced by #28788. --- tests/integration/sbws_testnet.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/integration/sbws_testnet.ini b/tests/integration/sbws_testnet.ini index 99b7f56..32fa1af 100644 --- a/tests/integration/sbws_testnet.ini +++ b/tests/integration/sbws_testnet.ini @@ -5,6 +5,9 @@ data_period = 1 [paths] sbws_home = /tmp/.sbws +[scanner] +country = ZZ + [destinations] local = on @@ -12,6 +15,7 @@ local = on ; url = https://localhost:28888/sbws.bin url = http://127.0.0.1:28888/sbws.bin verify = False +country = ZZ [tor] extra_lines =

1 0

[sbws/master] v3bwfile: include destinations' country in headers
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 61f2ba8450c8123e5c0ba2e04311d88ee9d85102 Author: juga0 <juga(a)riseup.net> Date: Mon Feb 11 10:50:53 2019 +0000 v3bwfile: include destinations' country in headers Closes: #29299. --- sbws/core/generate.py | 5 ++++- sbws/lib/v3bwfile.py | 13 +++++++++---- tests/unit/lib/test_v3bwfile.py | 7 ++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index c022b5b..7283c25 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -9,6 +9,7 @@ from argparse import ArgumentDefaultsHelpFormatter import os import logging from sbws.util.timestamp import now_fname +from sbws.lib import destination log = logging.getLogger(__name__) @@ -106,7 +107,9 @@ def main(args, conf): "cached-consensus") # Accept None as scanner_country to be compatible with older versions. scanner_country = conf['scanner'].get('country') - bw_file = V3BWFile.from_results(results, scanner_country, state_fpath, + destinations_countries = destination.parse_destinations_countries(conf) + bw_file = V3BWFile.from_results(results, scanner_country, + destinations_countries, state_fpath, args.scale_constant, scaling_method, torflow_cap=args.torflow_bw_margin, round_digs=args.round_digs, diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index b0ab385..a7ce57d 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -29,7 +29,7 @@ KEYVALUE_SEP_V2 = ' ' # List of the extra KeyValues accepted by the class EXTRA_ARG_KEYVALUES = ['software', 'software_version', 'file_created', 'earliest_bandwidth', 'generator_started', - 'scanner_country'] + 'scanner_country', 'destinations_countries'] STATS_KEYVALUES = ['number_eligible_relays', 'minimum_number_eligible_relays', 'number_consensus_relays', 'percent_eligible_relays', 'minimum_percent_eligible_relays'] @@ -141,7 +141,8 @@ class V3BWHeader(object): return self.strv2 @classmethod - def from_results(cls, results, scanner_country=None, state_fpath=''): + def from_results(cls, results, scanner_country=None, + destinations_countries=None, state_fpath=''): kwargs = dict() latest_bandwidth = cls.latest_bandwidth_from_results(results) earliest_bandwidth = cls.earliest_bandwidth_from_results(results) @@ -154,6 +155,8 @@ class V3BWHeader(object): # To be compatible with older bandwidth files, do not require it. if scanner_country is not None: kwargs['scanner_country'] = scanner_country + if destinations_countries is not None: + kwargs['destinations_countries'] = destinations_countries h = cls(timestamp, **kwargs) return h @@ -528,7 +531,8 @@ class V3BWFile(object): for bw_line in self.bw_lines]) @classmethod - def from_results(cls, results, scanner_country=None, state_fpath='', + def from_results(cls, results, scanner_country=None, + destinations_countries=None, state_fpath='', scale_constant=SBWS_SCALE_CONSTANT, scaling_method=TORFLOW_SCALING, torflow_obs=TORFLOW_OBS_LAST, @@ -555,7 +559,8 @@ class V3BWFile(object): """ log.info('Processing results to generate a bandwidth list file.') - header = V3BWHeader.from_results(results, scanner_country, state_fpath) + header = V3BWHeader.from_results(results, scanner_country, + destinations_countries, state_fpath) bw_lines_raw = [] number_consensus_relays = cls.read_number_consensus_relays( consensus_path) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 506f63b..0448c69 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -18,6 +18,9 @@ timestamp_l = str(timestamp) version_l = KEYVALUE_SEP_V1.join(['version', SPEC_VERSION]) scanner_country = 'US' scanner_country_l = KEYVALUE_SEP_V1.join(['scanner_country', scanner_country]) +destinations_countries = '00,DE' +destinations_countries_l = KEYVALUE_SEP_V1.join(['destinations_countries', + destinations_countries]) software_l = KEYVALUE_SEP_V1.join(['software', 'sbws']) software_version_l = KEYVALUE_SEP_V1.join(['software_version', version]) file_created = '2018-04-25T13:10:57' @@ -25,7 +28,8 @@ file_created_l = KEYVALUE_SEP_V1.join(['file_created', file_created]) latest_bandwidth = '2018-04-17T14:09:07' latest_bandwidth_l = KEYVALUE_SEP_V1.join(['latest_bandwidth', latest_bandwidth]) -header_ls = [timestamp_l, version_l, file_created_l, latest_bandwidth_l, +header_ls = [timestamp_l, version_l, destinations_countries_l, file_created_l, + latest_bandwidth_l, scanner_country_l, software_l, software_version_l, TERMINATOR] header_str = LINE_SEP.join(header_ls) + LINE_SEP earliest_bandwidth = '2018-04-16T14:09:07' @@ -56,6 +60,7 @@ v3bw_str = header_extra_str + raw_bwl_str def test_v3bwheader_str(): """Test header str""" header = V3BWHeader(timestamp_l, scanner_country=scanner_country, + destinations_countries=destinations_countries, file_created=file_created) assert header_str == str(header)

1 0

[tor/master] Update pre-commit.git-hook for ticket 29553
by asn＠torproject.org 28 Feb '19

28 Feb '19

commit b3b737b8750b2063c5be260287088defbfadd1b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:35:33 2019 -0500 Update pre-commit.git-hook for ticket 29553 - handle older source layout - handle empty changes directories - "set -e" so that we exit if there's a problem. --- changes/ticket29553 | 5 +++++ scripts/maint/pre-commit.git-hook | 33 ++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/changes/ticket29553 b/changes/ticket29553 new file mode 100644 index 000000000..af441b92b --- /dev/null +++ b/changes/ticket29553 @@ -0,0 +1,5 @@ + o Minor bugfixes (developer tools): + - Update our pre-commit.git-hook script to work correctly on older Tor + branches and release branches without any changes files, + and to actually exit when something fails. Fixes bug 29553; bugfix on + 0.4.0.2-alpha. diff --git a/scripts/maint/pre-commit.git-hook b/scripts/maint/pre-commit.git-hook index b4c4ce206..65fa99f4c 100755 --- a/scripts/maint/pre-commit.git-hook +++ b/scripts/maint/pre-commit.git-hook @@ -10,16 +10,31 @@ workdir=$(git rev-parse --show-toplevel) cd "$workdir" || exit 1 -python scripts/maint/lintChanges.py ./changes/* +set -e -perl scripts/maint/checkSpace.pl -C \ -src/lib/*/*.[ch] \ -src/core/*/*.[ch] \ -src/feature/*/*.[ch] \ -src/app/*/*.[ch] \ -src/test/*.[ch] \ -src/test/*/*.[ch] \ -src/tools/*.[ch] +if [ ! -z "ls ./changes/*" ]; then + python scripts/maint/lintChanges.py ./changes/* +fi + +if [ -d src/lib ]; then + # This is the layout in 0.3.5 + perl scripts/maint/checkSpace.pl -C \ + src/lib/*/*.[ch] \ + src/core/*/*.[ch] \ + src/feature/*/*.[ch] \ + src/app/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] +elif [ -d src/common]; then + # This was the layout before 0.3.5 + perl scripts/maint/checkSpace.pl -C \ + src/common/*/*.[ch] \ + src/or/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] +fi if test -e scripts/maint/checkIncludes.py; then python scripts/maint/checkIncludes.py

1 0

[tor/master] Merge branch 'tor-github/pr/720'
by asn＠torproject.org 28 Feb '19

28 Feb '19

commit cec555f44c6aac473258689ce7362e44e265c06e Merge: 600f5f0db b3b737b87 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 28 12:32:16 2019 +0200 Merge branch 'tor-github/pr/720' changes/ticket29553 | 5 +++++ scripts/maint/pre-commit.git-hook | 33 ++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-)

1 0

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

28 Feb '19

commit ab50927b2baf582977a3b382ac007686e6b6292c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 28 09:50:15 2019 +0000 Update translations for support-portal --- contents+fa.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 484766275..7c79a5cfe 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -3,6 +3,7 @@ # erinm, 2019 # Emma Peel, 2019 # Armin, 2019 +# Ali Mirjamali <ali.mirjamali(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-28 19:24+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Armin, 2019\n" +"Last-Translator: Ali Mirjamali <ali.mirjamali(a)gmail.com>, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2983,7 +2984,7 @@ msgstr "" #: https//support.torproject.org/tbb/run-tor-browser-and-different-browser/ #: (content/tbb/tbb-17/contents+en.lrquestion.title) msgid "Is it safe to run Tor Browser and another browser at the same time?" -msgstr "" +msgstr "آیا اجرا کردن هم زمان مرورگر تور با یک مرورگر دیگر امن است؟" #: https//support.torproject.org/tbb/run-tor-browser-and-different-browser/ #: (content/tbb/tbb-17/contents+en.lrquestion.description) @@ -4132,7 +4133,7 @@ msgstr "" #: https//support.torproject.org/tormobile/run-tor-on-android/ #: (content/tormobile/tormobile-1/contents+en.lrquestion.title) msgid "Can I run Tor on an Android device?" -msgstr "" +msgstr "آیا من می‌توانم تور را بر روی سخت افزار آندروید اجرا کنم؟" #: https//support.torproject.org/tormobile/run-tor-on-android/ #: (content/tormobile/tormobile-1/contents+en.lrquestion.description) @@ -4172,7 +4173,7 @@ msgstr "" #: https//support.torproject.org/tormobile/run-tor-on-ios/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.title) msgid "Can I run Tor on an iOS device?" -msgstr "" +msgstr "آیا من می‌توانم تور را بر روی سخت افزار iOS اجرا کنم؟" #: https//support.torproject.org/tormobile/run-tor-on-ios/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description) @@ -5685,12 +5686,12 @@ msgstr "" #: https//support.torproject.org/misc/does-tor-project-offer-hosting/ #: (content/misc/misc-10/contents+en.lrquestion.title) msgid "Does the Tor Project offer hosting?" -msgstr "" +msgstr "آیا پروژه تور خدمات هاستینگ ارائه می‌دهد؟" #: https//support.torproject.org/misc/does-tor-project-offer-hosting/ #: (content/misc/misc-10/contents+en.lrquestion.description) msgid "No, the Tor Project does not offer hosting services." -msgstr "" +msgstr "خیر، پروژه تور خدمات هاستینگ ارائه نمی‌دهد." #: https//support.torproject.org/misc/change-the-number-of-hops-tor-uses/ #: (content/misc/misc-11/contents+en.lrquestion.title)

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 28 Feb '19

28 Feb '19

commit 214f4ecda19aa3ec3ecd16615b8ca3ff6d2a4798 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 28 09:49:36 2019 +0000 Update translations for tor-launcher-properties --- fa/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties index 88db1be1e..cffe687f9 100644 --- a/fa/torlauncher.properties +++ b/fa/torlauncher.properties @@ -53,10 +53,10 @@ torlauncher.forAssistance2=برای کمک، %S را ببینید. torlauncher.copiedNLogMessages=کپی کامل شد. %S پیامهای ثبت شده آماده است تا Paste شود در ویرایشگر متن یا یک ایمیل. torlauncher.bootstrapStatus.starting=راه اندازی -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy +torlauncher.bootstrapStatus.conn_pt=در حال اتصال به پل +torlauncher.bootstrapStatus.conn_done_pt=اتصال به پل برقرار شد +torlauncher.bootstrapStatus.conn_proxy=در حال اتصال به پراکسی +torlauncher.bootstrapStatus.conn_done_proxy=اتصال به پراکسی برقرار شد torlauncher.bootstrapStatus.conn=Connecting to a Tor relay torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay

1 0