June 2015 - tor-commits - lists.torproject.org

[stem/master] Installation test didn't actually exercise python3
by atagar＠torproject.org 11 Jun '15

11 Jun '15

commit b60583632f72729751433356093e96562b947cf1 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 11 10:04:33 2015 -0700 Installation test didn't actually exercise python3 We hardcoded 'python' in the spots where we shelled out, causing us to usually do so via python2 even if we're running the tests with python3. Using the interpreter we're running the tests with instead. --- test/integ/installation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 1e17568..70a8ad9 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -1,6 +1,7 @@ import glob import os import shutil +import sys import unittest import stem @@ -21,14 +22,14 @@ class TestInstallation(unittest.TestCase): try: os.chdir(base_directory) - stem.util.system.call('python setup.py install --prefix /tmp/stem_test') - stem.util.system.call('python setup.py clean --all') # tidy up the build directory + stem.util.system.call(sys.executable + ' setup.py install --prefix /tmp/stem_test') + stem.util.system.call(sys.executable + ' setup.py clean --all') # tidy up the build directory site_packages_paths = glob.glob('/tmp/stem_test/lib*/*/site-packages') if len(site_packages_paths) != 1: self.fail('We should only have a single site-packages directory, but instead had: %s' % site_packages_paths) - self.assertEqual(stem.__version__, stem.util.system.call(['python', '-c', "import sys;sys.path.insert(0, '%s');import stem;print(stem.__version__)" % site_packages_paths[0]])[0]) + self.assertEqual(stem.__version__, stem.util.system.call([sys.executable, '-c', "import sys;sys.path.insert(0, '%s');import stem;print(stem.__version__)" % site_packages_paths[0]])[0]) finally: shutil.rmtree('/tmp/stem_test') os.chdir(original_cwd)

1 0

[webwml/master] I just tagged and uploaded 0.2.6.9
by nickm＠torproject.org 11 Jun '15

11 Jun '15

commit c74c12822572fde9b17b122f7a34be44a32bb42f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 11 12:57:05 2015 -0400 I just tagged and uploaded 0.2.6.9 --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e3851cd..68aae9e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.2.6.8 +export STABLETAG=tor-0.2.6.9 export DEVTAG=tor-0.2.7.1-alpha WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index 784c982..5250e01 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,4 +1,4 @@ -<define-tag version-stable whitespace=delete>0.2.6.8</define-tag> +<define-tag version-stable whitespace=delete>0.2.6.9</define-tag> <define-tag version-alpha whitespace=delete>0.2.7.1-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.6.7</define-tag>

1 0

[nyx/master] Allow our tests to run with python3
by atagar＠torproject.org 11 Jun '15

11 Jun '15

commit a610441d33f451a4e344cea0658b0273aac81ac1 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 11 09:51:51 2015 -0700 Allow our tests to run with python3 No, Nyx doesn't fully support python3 yet but a step in the right direction. Now our tests pass when run via python3. Oh, and fixed a python3 installation issue in the process. --- nyx/arguments.py | 2 +- nyx/config_panel.py | 16 ++++++++-------- nyx/util/log.py | 2 +- run_tests.py | 10 +++++----- setup.py | 3 +-- test/installation.py | 10 +++++----- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/nyx/arguments.py b/nyx/arguments.py index 834fea1..4351974 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -251,4 +251,4 @@ def missing_event_types(): tor_event_types = response.split(' ') recognized_types = TOR_EVENT_TYPES.values() - return filter(lambda x: x not in recognized_types, tor_event_types) + return list(filter(lambda x: x not in recognized_types, tor_event_types)) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 170ef46..05a65e0 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -7,7 +7,7 @@ import curses import threading import nyx.controller -import popups +import nyx.popups from nyx.util import panel, tor_config, tor_controller, ui_tools @@ -352,7 +352,7 @@ class ConfigPanel(panel.Panel): options = [FIELD_ATTR[field][0] for field in Field] old_selection = [FIELD_ATTR[field][0] for field in CONFIG['features.config.order']] option_colors = dict([FIELD_ATTR[field] for field in Field]) - results = popups.show_sort_dialog(title_label, options, old_selection, option_colors) + results = nyx.popups.show_sort_dialog(title_label, options, old_selection, option_colors) if results: # converts labels back to enums @@ -388,7 +388,7 @@ class ConfigPanel(panel.Panel): prompt_msg = '%s Value (esc to cancel): ' % config_option is_prepopulated = CONFIG['features.config.prepopulateEditValues'] - new_value = popups.input_prompt(prompt_msg, initial_value if is_prepopulated else '') + new_value = nyx.popups.input_prompt(prompt_msg, initial_value if is_prepopulated else '') if new_value is not None and new_value != initial_value: try: @@ -416,7 +416,7 @@ class ConfigPanel(panel.Panel): self.redraw(True) except Exception as exc: - popups.show_msg('%s (press any key)' % exc) + nyx.popups.show_msg('%s (press any key)' % exc) elif key.match('a'): self.show_all = not self.show_all self.redraw(True) @@ -438,7 +438,7 @@ class ConfigPanel(panel.Panel): # display a popup for saving the current configuration config_lines = tor_config.get_custom_options(True) - popup, width, height = popups.init(len(config_lines) + 2) + popup, width, height = nyx.popups.init(len(config_lines) + 2) if not popup: return @@ -544,7 +544,7 @@ class ConfigPanel(panel.Panel): if selection == 1: # prompts user for a configuration location - config_location = popups.input_prompt('Save to (esc to cancel): ', config_location) + config_location = nyx.popups.input_prompt('Save to (esc to cancel): ', config_location) if not config_location: prompt_canceled = True @@ -556,9 +556,9 @@ class ConfigPanel(panel.Panel): except IOError as exc: msg = 'Unable to save configuration (%s)' % exc.strerror - popups.show_msg(msg, 2) + nyx.popups.show_msg(msg, 2) finally: - popups.finalize() + nyx.popups.finalize() def get_help(self): return [ diff --git a/nyx/util/log.py b/nyx/util/log.py index c2e1a4c..3bd0d40 100644 --- a/nyx/util/log.py +++ b/nyx/util/log.py @@ -481,7 +481,7 @@ def read_tor_log(path, read_limit = None): timestamp_comp = list(time.strptime(timestamp_str, '%Y %b %d %H:%M:%S')) timestamp_comp[8] = isdst - timestamp = int(time.mktime(timestamp_comp)) # converts local to unix time + timestamp = int(time.mktime(tuple(timestamp_comp))) # converts local to unix time if timestamp > time.time(): # log entry is from before a year boundary diff --git a/run_tests.py b/run_tests.py index 6e62169..aea9d01 100755 --- a/run_tests.py +++ b/run_tests.py @@ -34,13 +34,13 @@ def main(): orphaned_pyc = stem.util.test_tools.clean_orphaned_pyc(NYX_BASE) for path in orphaned_pyc: - print 'Deleted orphaned pyc file: %s' % path + print('Deleted orphaned pyc file: %s' % path) tests = unittest.defaultTestLoader.discover('test', pattern='*.py') test_runner = unittest.TextTestRunner() test_runner.run(tests) - print + print('') static_check_issues = {} @@ -66,13 +66,13 @@ def main(): static_check_issues.setdefault(path, []).append(issue) if static_check_issues: - print 'STATIC CHECKS' + print('STATIC CHECKS') for file_path in static_check_issues: - print '* %s' % file_path + print('* %s' % file_path) for issue in static_check_issues[file_path]: - print ' line %-4s - %-40s %s' % (issue.line_number, issue.message, issue.line) + print(' line %-4s - %-40s %s' % (issue.line_number, issue.message, issue.line)) print diff --git a/setup.py b/setup.py index 43d7a97..f5399ef 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,6 @@ import gzip import os -import shutil import stat import sysconfig @@ -64,7 +63,7 @@ class NyxInstaller(install): new_shebang = '#!%s\n' % os.path.join(sysconfig.get_config_var('BINDIR'), python_cmd) log.info("adjusting bin script's shebang line '%s' -> '%s'" % (orig_shebang.strip(), new_shebang.strip())) - dest_file.write(new_shebang) + dest_file.write(str.encode(new_shebang)) dest_file.write(source_file.read()) mode = ((os.stat(dest)[stat.ST_MODE]) | 0o555) & 0o7777 diff --git a/test/installation.py b/test/installation.py index e233d67..3095e16 100644 --- a/test/installation.py +++ b/test/installation.py @@ -20,20 +20,20 @@ class TestInstallation(unittest.TestCase): try: os.chdir(base_directory) - stem.util.system.call('python setup.py install --prefix /tmp/nyx_test --man-page /tmp/nyx_test/nyx.1.gz --sample-path /tmp/nyx_test/nyxrc.sample') - stem.util.system.call('python setup.py clean --all') # tidy up the build directory + stem.util.system.call(sys.executable + ' setup.py install --prefix /tmp/nyx_test --man-page /tmp/nyx_test/nyx.1.gz --sample-path /tmp/nyx_test/nyxrc.sample') + stem.util.system.call(sys.executable + ' setup.py clean --all') # tidy up the build directory site_packages_paths = glob.glob('/tmp/nyx_test/lib*/*/site-packages') if len(site_packages_paths) != 1: self.fail('We should only have a single site-packages directory, but instead had: %s' % site_packages_paths) - self.assertEqual(nyx.__version__, stem.util.system.call(['python', '-c', "import sys;sys.path.insert(0, '%s');import nyx;print(nyx.__version__)" % site_packages_paths[0]])[0]) + self.assertEqual(nyx.__version__, stem.util.system.call([sys.executable, '-c', "import sys;sys.path.insert(0, '%s');import nyx;print(nyx.__version__)" % site_packages_paths[0]])[0]) - process_path = sys.path + ['/tmp/nyx_test/lib/python2.7/site-packages'] + process_path = [site_packages_paths[0]] + sys.path process = subprocess.Popen(['/tmp/nyx_test/bin/nyx', '--help'], stdout = subprocess.PIPE, env = {'PYTHONPATH': ':'.join(process_path)}) stdout = process.communicate()[0] - self.assertTrue(stdout.startswith('Usage nyx [OPTION]')) + self.assertTrue(stdout.startswith(b'Usage nyx [OPTION]')) finally: shutil.rmtree('/tmp/nyx_test') os.chdir(original_cwd)

1 0

[stem/master] Python3 type issue for tail()
by atagar＠torproject.org 11 Jun '15

11 Jun '15

commit 80df42fe0bb0e2386cb0b09601b6a122af44c4e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 11 09:52:45 2015 -0700 Python3 type issue for tail() Last change was a step in the right direction for tail() to be python3 compatible, but neglected to normalize the strings a couple spots. --- stem/util/system.py | 6 +++--- test/unit/util/system.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 4c5349b..eb7b9ad 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -777,13 +777,13 @@ def tail(target, lines = None): target.seek(0, 2) # go to the end of the file block_end_byte = target.tell() block_number = -1 - content = '' + content = b'' while (lines is None or lines > 0) and block_end_byte > 0: if (block_end_byte - BLOCK_SIZE > 0): # read the last block we haven't yet read target.seek(block_number * BLOCK_SIZE, 2) - content, completed_lines = (target.read(BLOCK_SIZE) + content).split('\n', 1) + content, completed_lines = (target.read(BLOCK_SIZE) + content).split(b'\n', 1) else: # reached the start of the file, just read what's left target.seek(0, 0) @@ -794,7 +794,7 @@ def tail(target, lines = None): if lines is not None: lines -= 1 - yield line + yield stem.util.str_tools._to_unicode(line) block_end_byte -= BLOCK_SIZE block_number -= 1 diff --git a/test/unit/util/system.py b/test/unit/util/system.py index dd1e30f..242a7fb 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -382,7 +382,7 @@ class TestSystem(unittest.TestCase): # by file handle - with open(path) as riddle_file: + with open(path, 'rb') as riddle_file: self.assertEqual([' both the wicked and sweet.'], list(system.tail(riddle_file, 1))) self.assertEqual([], list(system.tail(path, 0)))

1 0

[stem/master] Allow for tail() to do seeks relative to the end of files
by atagar＠torproject.org 11 Jun '15

11 Jun '15

commit 6ea9e05e088b640e2ba69c3c125f3cc9ebe46802 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 11 09:24:30 2015 -0700 Allow for tail() to do seeks relative to the end of files Our tail() function had an issue where under python3 nyx's tests fail with... ====================================================================== ERROR: test_with_read_limit (util.log.read_tor_log.TestReadTorLog) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/nyx/test/util/log/read_tor_log.py", line 28, in test_with_read_limit entries = list(read_tor_log(data_path('tor_log'), 5)) File "/home/atagar/Desktop/nyx/nyx/util/log.py", line 456, in read_tor_log for line in stem.util.system.tail(path, read_limit): File "/home/atagar/Desktop/nyx/stem/util/system.py", line 769, in tail for line in tail(target_file, lines): File "/home/atagar/Desktop/nyx/stem/util/system.py", line 785, in tail target.seek(block_number * BLOCK_SIZE, 2) io.UnsupportedOperation: can't do nonzero end-relative seeks This is described on... https://stackoverflow.com/questions/21533391/seeking-from-end-of-file-throw… Fix is trivial enough. :P --- stem/util/system.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/util/system.py b/stem/util/system.py index aa13cb9..4c5349b 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -765,7 +765,7 @@ def tail(target, lines = None): """ if isinstance(target, str): - with open(target) as target_file: + with open(target, 'rb') as target_file: for line in tail(target_file, lines): yield line

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 33747861d6052b8dcb873d3df97165cca0ad8ce5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 15:45:48 2015 +0000 Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 37e815e..e0321b5 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -15,10 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> +<!ENTITY torSettings.proxyPageTitle "本地代理配置"> <!ENTITY torSettings.proxyQuestion "是否需要本地代理访问互联网？">  <!ENTITY torSettings.proxyHelp "如果不知道如何回答该问题，请检查其他浏览器中的互联网设置，查看是否使用本地代理。"> <!ENTITY torSettings.enterProxy "输入代理设置。"> +<!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> <!ENTITY torSettings.bridgeHelp "如果不理解该问题，请选择“否”。如果选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难于封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 5cd1883e0b358c2728dc5ad17fba271f57335d90 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 15:45:44 2015 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 968891c..e0321b5 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "本地代理配置"> <!ENTITY torSettings.proxyQuestion "是否需要本地代理访问互联网？">  <!ENTITY torSettings.proxyHelp "如果不知道如何回答该问题，请检查其他浏览器中的互联网设置，查看是否使用本地代理。"> <!ENTITY torSettings.enterProxy "输入代理设置。"> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> <!ENTITY torSettings.bridgeHelp "如果不理解该问题，请选择“否”。如果选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难于封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">

1 0

[nyx/master] Combining resource installation functions
by atagar＠torproject.org 11 Jun '15

11 Jun '15

commit bc3d7c0fb65348ca53bc060ad85919e266e9afe8 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 11 08:30:31 2015 -0700 Combining resource installation functions Our helpers for installing the man page and nyxrc example were pretty much the same, so combining them. With this we can also install compressed nyxrc examples, which might be handy. --- setup.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 103b674..43d7a97 100644 --- a/setup.py +++ b/setup.py @@ -44,12 +44,8 @@ class NyxInstaller(install): install.run(self) self.install_bin_script('run_nyx', os.path.join(self.install_scripts, 'nyx')) - - if self.man_page: - self.install_man_page(os.path.join('nyx', 'resources', 'nyx.1'), self.man_page) - - if self.sample_path: - self.install_sample('nyxrc.sample', self.sample_path) + self.install_file('man page', os.path.join('nyx', 'resources', 'nyx.1'), self.man_page) + self.install_file('nyxrc sample', 'nyxrc.sample', self.sample_path) def install_bin_script(self, source, dest): # Install our bin script. We do this ourselves rather than with the setup() @@ -75,9 +71,12 @@ class NyxInstaller(install): os.chmod(dest, mode) log.info("installed bin script to '%s'" % dest) - def install_man_page(self, source, dest): - if not os.path.exists(source): - raise OSError(None, "man page doesn't exist at '%s'" % source) + def install_file(self, resource, source, dest): + if not dest: + log.info('skipping installation of the %s' % resource) + return + elif not os.path.exists(source): + raise OSError(None, "%s doesn't exist at '%s'" % (resource, source)) self.mkpath(os.path.dirname(dest)) open_func = gzip.open if dest.endswith('.gz') else open @@ -85,15 +84,7 @@ class NyxInstaller(install): with open(source, 'rb') as source_file: with open_func(dest, 'wb') as dest_file: dest_file.write(source_file.read()) - log.info("installed man page to '%s'" % dest) - - def install_sample(self, source, dest): - if not os.path.exists(source): - raise OSError(None, "nyxrc sample doesn't exist at '%s'" % source) - - self.mkpath(os.path.dirname(dest)) - shutil.copyfile(source, dest) - log.info("installed sample nyxrc to '%s'" % dest) + log.info("installed %s to '%s'" % (resource, dest)) # installation requires us to be in our setup.py's directory

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 948a851b40d67eb1dde503a0253fe684f44923aa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 15:15:47 2015 +0000 Update translations for tor-launcher-network-settings_completed --- es/network-settings.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 6aa47b2..a117fa0 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -15,10 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> +<!ENTITY torSettings.proxyPageTitle "Configuración del proxy local"> <!ENTITY torSettings.proxyQuestion "¿Necesita mi computadora utilizar un proxy local para acceder a Internet?">  <!ENTITY torSettings.proxyHelp "Si no está seguro de cómo responder a esta pregunta, mire la configuración de Internet en otro navegador para ver si está configurado para utilizar un proxy (interpuesto) local."> <!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy."> +<!ENTITY torSettings.bridgePageTitle "Configuración de puentes Tor"> <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> <!ENTITY torSettings.bridgeHelp "Si no está seguro de como responder a esta pregunta, elija No.  Si usted elige Sí, se le pedirá configurar puentes Tor, los cuales son repetidores no listados que hacen más difícil el bloqueo de las conexiones hacia la red Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puede utilizar el conjunto de repetidores puente (bridge) proporcionado, o puede obtener e introducir un juego de puentes personalizado.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 35ee6e5200856f0736bf8108f78ccb1b0f48fa72 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 15:15:43 2015 +0000 Update translations for tor-launcher-network-settings --- es/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 01f7253..a117fa0 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Configuración del proxy local"> <!ENTITY torSettings.proxyQuestion "¿Necesita mi computadora utilizar un proxy local para acceder a Internet?">  <!ENTITY torSettings.proxyHelp "Si no está seguro de cómo responder a esta pregunta, mire la configuración de Internet en otro navegador para ver si está configurado para utilizar un proxy (interpuesto) local."> <!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Configuración de puentes Tor"> <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> <!ENTITY torSettings.bridgeHelp "Si no está seguro de como responder a esta pregunta, elija No.  Si usted elige Sí, se le pedirá configurar puentes Tor, los cuales son repetidores no listados que hacen más difícil el bloqueo de las conexiones hacia la red Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puede utilizar el conjunto de repetidores puente (bridge) proporcionado, o puede obtener e introducir un juego de puentes personalizado.">

1 0