November 2012 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit a616736612ba7e7880b5748c8909ef9bda58035e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 16:45:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 12 ++++++------ fr/vidalia_fr.po | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9b89134..6ed7c6b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-07 12:23+0000\n" +"PO-Revision-Date: 2012-11-07 16:44+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -130,23 +130,23 @@ msgstr "Examinar " msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "Carpeta de Datos " +msgstr "Carpeta de Datos" msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" -msgstr "Almacenar datos de Tor en la siguiente carpeta " +msgstr "Almacenar datos de Tor en la siguiente carpeta" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "Seleccione la carpeta a usar para almacenar los datos de Tor " +msgstr "Seleccione la carpeta que se usará para almacenar los datos de Tor" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "Control de Tor (Protocolo de)" +msgstr "Control de Tor" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "Usar conexión TCP (ControlPort) " +msgstr "Usar conexión TCP (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index b2d6ccc..6a6ef05 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-10-26 09:41+0000\n" +"PO-Revision-Date: 2012-11-07 16:42+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2775,7 +2775,7 @@ msgctxt "QObject" msgid "" "The failed options were NOT saved in your torrc and will be applied when you" " restart." -msgstr "" +msgstr "Les options erronées ont PAS été sauvegardées dans votre fichier torrc et seront appliquées au redémarrage." msgctxt "QObject" msgid "Vidalia was unable to save the options to the torrc file." @@ -3261,7 +3261,7 @@ msgstr "To" msgctxt "ServerPage" msgid "Push no more than" -msgstr "" +msgstr "Poussez pas plus de" msgctxt "ServerPage" msgid "time"

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 08ced126e6a34f7d5cfcf558ee9a592ac2a15785 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 16:45:12 2012 +0000 Update translations for orbot_completed --- values-fr/strings.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 3807707..e5bf52e 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -75,8 +75,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n /n/n\n Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot est prêt!</string> @@ -105,6 +108,8 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 5cd52437aa2a0b07fb63947b8858820a37a50c86 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 16:45:08 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 3807707..e5bf52e 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -75,8 +75,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n /n/n\n Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot est prêt!</string> @@ -105,6 +108,8 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[ooni-probe/master] Implement config file support
by art＠torproject.org 07 Nov '12

07 Nov '12

commit 37221cd7bfe6fad3750ae2c701d22a7bf03b9793 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 7 17:06:40 2012 +0100 Implement config file support * You are able to specify basic and advanced options in YAML format --- .gitignore | 2 ++ ooni/__init__.py | 4 ++-- ooni/config.py | 36 ++++++++++++++++++++++++++++++++++++ ooni/oconfig.py | 8 -------- ooni/oonicli.py | 14 +++++++------- ooni/reporter.py | 26 +++++++++++++++++++------- ooni/runner.py | 20 ++++++++++---------- ooni/utils/geodata.py | 4 ++++ ooniprobe.conf | 19 +++++++++++++++++++ 9 files changed, 99 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 4a6b565..d1015ab 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ oonib/data/* fluff/ pcaps/ report*.yaml +docs/build/* +data/*.dat diff --git a/ooni/__init__.py b/ooni/__init__.py index 0c9f297..16b20ca 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,4 +1,4 @@ -from . import oconfig +from . import config from . import inputunit from . import kit from . import lib @@ -9,6 +9,6 @@ from . import runner from . import templates from . import utils -__all__ = ['oconfig', 'inputunit', 'kit', +__all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', 'runner', 'templates', 'utils'] diff --git a/ooni/config.py b/ooni/config.py new file mode 100644 index 0000000..97f396c --- /dev/null +++ b/ooni/config.py @@ -0,0 +1,36 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo "hellais" Filastò <art(a)fuffa.org> +# :licence: see LICENSE + +import os +import yaml + +from ooni.utils import Storage + +def get_root_path(): + this_directory = os.path.dirname(__file__) + root = os.path.join(this_directory, '..') + root = os.path.abspath(root) + return root + +config_file = os.path.join(get_root_path(), 'ooniprobe.conf') +try: + f = open(config_file) +except IOError: + raise Exception("Unable to open config file. "\ + "Create a config file called ooniprobe.conf") + +config_file_contents = '\n'.join(f.readlines()) +configuration = yaml.safe_load(config_file_contents) + +# Process the basic configuration options +basic = Storage() +for k, v in configuration['basic'].items(): + basic[k] = v + +# Process the advanced configuration options +advanced = Storage() +for k, v in configuration['advanced'].items(): + advanced[k] = v + diff --git a/ooni/oconfig.py b/ooni/oconfig.py deleted file mode 100644 index 202b569..0000000 --- a/ooni/oconfig.py +++ /dev/null @@ -1,8 +0,0 @@ -from ooni.utils import Storage - -# XXX move this to an actual configuration file -basic = Storage() -basic.logfile = '/tmp/ooniprobe.log' -advanced = Storage() - -advanced.debug = True diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 6def1df..5ee6deb 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -87,20 +87,20 @@ class Options(usage.Options, app.ReactorSelectionMixin): def run(): if len(sys.argv) == 1: sys.argv.append("--help") - config = Options() + cmd_line_options = Options() try: - config.parseOptions() + cmd_line_options.parseOptions() except usage.error, ue: raise SystemExit, "%s: %s" % (sys.argv[0], ue) - if config['debug-stacktraces']: + if cmd_line_options['debug-stacktraces']: defer.setDebugging(True) - classes = runner.findTestClassesFromConfig(config) - casesList, options = runner.loadTestsAndOptions(classes, config) + classes = runner.findTestClassesFromConfig(cmd_line_options) + casesList, options = runner.loadTestsAndOptions(classes, cmd_line_options) for idx, cases in enumerate(casesList): - orunner = runner.ORunner(cases, options[idx], config) - log.start(config['logfile']) + orunner = runner.ORunner(cases, options[idx], cmd_line_options) + log.start(cmd_line_options['logfile']) orunner.run() diff --git a/ooni/reporter.py b/ooni/reporter.py index a02e5a9..f3fbca6 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -18,6 +18,7 @@ from twisted.internet import defer from ooni.templates.httpt import BodyReceiver, StringProducer from ooni.utils import date, log, geodata +from ooni import config try: ## Get rid of the annoying "No route found for @@ -187,17 +188,28 @@ class ReporterFactory(OReporter): client_geodata = {} log.msg("Running geo IP lookup via check.torproject.org") - client_geodata['ip'] = yield geodata.myIP() - client_geodata['asn'] = 'unknown' - client_geodata['city'] = 'unknown' - client_geodata['countrycode'] = 'unknown' + client_ip = yield geodata.myIP() + if config.includeip: + client_geodata['ip'] = client_ip + else: + client_geodata['ip'] = None + + client_geodata['asn'] = None + client_geodata['city'] = None + client_geodata['countrycode'] = None try: import txtorcon client_location = txtorcon.util.NetLocation(client_geodata['ip']) - client_geodata['asn'] = client_location.asn - client_geodata['city'] = client_location.city - client_geodata['countrycode'] = client_location.countrycode + if config.includeasn: + client_geodata['asn'] = client_location.asn + + if config.includecity: + client_geodata['city'] = client_location.city + + if config.includecountry: + client_geodata['countrycode'] = client_location.countrycode + except ImportError: log.err("txtorcon is not installed. Geolocation lookup is not"\ "supported") diff --git a/ooni/runner.py b/ooni/runner.py index 102ff29..797a9d4 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -23,7 +23,7 @@ from ooni.nettest import InputTestSuite from ooni.reporter import ReporterFactory from ooni.utils import log, date -def processTest(obj, config): +def processTest(obj, cmd_line_options): """ Process the parameters and :class:`twisted.python.usage.Options` of a :class:`ooni.nettest.Nettest`. @@ -31,7 +31,7 @@ def processTest(obj, config): :param obj: An uninstantiated old test, which should be a subclass of :class:`ooni.plugoo.tests.OONITest`. - :param config: + :param cmd_line_options: A configured and instantiated :class:`twisted.python.usage.Options` class. """ @@ -63,7 +63,7 @@ def processTest(obj, config): options = Options() - options.parseOptions(config['subArgs']) + options.parseOptions(cmd_line_options['subArgs']) obj.localOptions = options if input_file: @@ -76,14 +76,14 @@ def processTest(obj, config): return obj -def findTestClassesFromConfig(config): +def findTestClassesFromConfig(cmd_line_options): """ Takes as input the command line config parameters and returns the test case classes. If it detects that a certain test class is using the old OONIProbe format, then it will adapt it to the new testing system. - :param config: + :param cmd_line_options: A configured and instantiated :class:`twisted.python.usage.Options` class. :return: @@ -91,14 +91,14 @@ def findTestClassesFromConfig(config): commandline. """ - filename = config['test'] + filename = cmd_line_options['test'] classes = [] module = filenameToModule(filename) for name, val in inspect.getmembers(module): if isTestCase(val): log.debug("Detected TestCase %s" % val) - classes.append(processTest(val, config)) + classes.append(processTest(val, cmd_line_options)) return classes def makeTestCases(klass, tests, method_prefix): @@ -112,7 +112,7 @@ def makeTestCases(klass, tests, method_prefix): cases.append(klass(method_prefix+test)) return cases -def loadTestsAndOptions(classes, config): +def loadTestsAndOptions(classes, cmd_line_options): """ Takes a list of test classes and returns their testcases and options. Legacy tests will be adapted. @@ -144,7 +144,7 @@ class ORunner(object): them in input units. I also create all the report instances required to run the tests. """ - def __init__(self, cases, options=None, config=None): + def __init__(self, cases, options=None, cmd_line_options=None): self.baseSuite = InputTestSuite self.cases = cases self.options = options @@ -168,7 +168,7 @@ class ORunner(object): self.inputs = [None] try: - reportFile = open(config['reportfile'], 'a+') + reportFile = open(cmd_line_options['reportfile'], 'a+') except TypeError: filename = 'report_'+date.timestamp()+'.yaml' reportFile = open(filename, 'a+') diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py index 9f782e8..5254044 100644 --- a/ooni/utils/geodata.py +++ b/ooni/utils/geodata.py @@ -1,4 +1,8 @@ import re +import pygeoip + +from ooni import config + from twisted.web.client import Agent from twisted.internet import reactor, defer, protocol diff --git a/ooniprobe.conf b/ooniprobe.conf new file mode 100644 index 0000000..278dc4c --- /dev/null +++ b/ooniprobe.conf @@ -0,0 +1,19 @@ +# This is the configuration file for OONIProbe +# This file follows the YAML markup format: http://yaml.org/spec/1.2/spec.html +# Keep in mind that indentation matters. + +basic: + # Where OONIProbe should be writing it's log file + logfile: /tmp/ooniprobe.log + # Should we include the IP address of the probe in the report? + includeip: true + # Should we include the ASN of the probe in the report? + includeasn: true + # Should we include the ASN of the probe in the report? + includecountry: true + # Should we include the ASN of the probe in the report? + includecity: true +advanced: + geoip_data_dir: /home/x/code/networking/ooni-probe/data + debug: true +

1 0

[tor-design-2012/master] Add our initial work breakdown, for reference.
by nickm＠torproject.org 07 Nov '12

07 Nov '12

commit b5022a49564f60fc91df539258b05a3c3370eb93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 10:16:41 2012 -0500 Add our initial work breakdown, for reference. --- todo | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/todo b/todo new file mode 100644 index 0000000..c807072 --- /dev/null +++ b/todo @@ -0,0 +1,22 @@ +Tentative breakdown. Feel free to take on something here that isn't done +yet! + + + * Integrate the content from the first blog post [nick] ** + * Integrate content from the second blog post [steven] + * Integrate content from the third blog post [steven] + + * Revise the abstract and introduction [nick] + * Revise related work [steven] + + * Revise design goals and assumptions [steven] + * Revise tor-design up to "opening and closing streams" [nick] ** + * Revise tor-design "opening and closing streams" onward [steven] + * Revise hidden services section [nick] + + * Revise "other design decisions" [nick] + * Revise "attacks and defenses" [steven] + * Replace "early experiences: Tor in the wild" [???? Nick?] + + * Revise "open questions in low-latency anonymity" and "future + directions" [steven]

1 0

[metrics-tasks/master] Make a note for atagar's OrderedDict suggestion (#6471).
by karsten＠torproject.org 07 Nov '12

07 Nov '12

commit 44a529a4c87c4784ac4a0832cf65916a77072247 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 7 08:28:53 2012 -0500 Make a note for atagar's OrderedDict suggestion (#6471). --- task-6471/python/pygeodate.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/task-6471/python/pygeodate.py b/task-6471/python/pygeodate.py index 72f13d8..f9525f0 100644 --- a/task-6471/python/pygeodate.py +++ b/task-6471/python/pygeodate.py @@ -17,7 +17,9 @@ class Range: class Database: def __init__(self): - # TODO Replace with crit-bit tree if performance becomes a problem + # TODO Replace with crit-bit tree if performance becomes a problem; + # alternatively, use an OrderedDict which is the equivalent of + # LinkedHashMap in Java. self.data = [] self.dates = [] self.keys = []

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 36308c28d62c5a59825353fa97b0e962dd7fe65a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 12:45:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ee281c1..9b89134 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-06 15:55+0000\n" +"PO-Revision-Date: 2012-11-07 12:23+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr "Seleccione la carpeta a usar para almacenar los datos de Tor " msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "Control de Tor " +msgstr "Control de Tor (Protocolo de)" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit bce9c2c2401f358befafd15c74f60c1a225ba03f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 12:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ee281c1..9b89134 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-06 15:55+0000\n" +"PO-Revision-Date: 2012-11-07 12:23+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr "Seleccione la carpeta a usar para almacenar los datos de Tor " msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "Control de Tor " +msgstr "Control de Tor (Protocolo de)" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)"

1 0

[torsocks/pending-changes] Update lib dir check
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit 1699610ecc6fd64f85c6fa3cee56d24ba2010d87 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Nov 5 16:29:52 2012 -0500 Update lib dir check Address issue 33 where /usr/lib64 is the proper lib dir but /usr/lib is still set in torsocks.in --- src/torsocks.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 53db2fc..606d3d4 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -78,6 +78,12 @@ LIB_NAME="libtorsocks" SHLIB_EXT="@SHLIB_EXT@" SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +# Check for libtorsocks and if set the 64bit variant +if [ ! -f $SHLIB ]; then + LIBDIR="@prefix@/lib64/torsocks" + SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +fi + # Ensure libtorsocks exists, if [ ! -f $SHLIB ]; then echo "$0: $SHLIB does not exist! Try re-installing torsocks."

1 0

[torsocks/pending-changes] Merge branch 'libdir' into pending-changes
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit 5441e526b111eb60ba6fe30d319d51a3c09f38f6 Merge: e8b9696 1699610 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 20:13:17 2012 -0800 Merge branch 'libdir' into pending-changes src/torsocks.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)

1 0