- tor-commits - lists.torproject.org

[ooni-probe/master] Finish reafactoring and porting daphn3.
by art＠torproject.org 12 Nov '12

12 Nov '12

commit 03a8462714d0609d0548d24fb5f8762b8d12d358 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 20:12:18 2012 +0100 Finish reafactoring and porting daphn3. * XXX not fully tested --- nettests/core/daphn3.py | 71 +++++++++++++++------- ooni/kit/daphn3.py | 125 ++++++++++++++++++++++--------------- oonib/config.py | 4 +- oonib/testhelpers/tcp_helpers.py | 46 ++++++++++++-- 4 files changed, 164 insertions(+), 82 deletions(-) diff --git a/nettests/core/daphn3.py b/nettests/core/daphn3.py index cc4803c..c277c56 100644 --- a/nettests/core/daphn3.py +++ b/nettests/core/daphn3.py @@ -6,18 +6,42 @@ from ooni import nettest from ooni.kit import daphn3 from ooni.utils import log +class Daphn3ClientProtocol(daphn3.Daphn3Protocol): + def nextStep(self): + log.debug("Moving on to next step in the state walk") + self.current_data_received = 0 + if self.current_step >= (len(self.steps) - 1): + log.msg("Reached the end of the state machine") + log.msg("Censorship fingerpint bisected!") + step_idx, mutation_idx = self.factory.mutation + log.msg("step_idx: %s | mutation_id: %s" % (step_idx, mutation_idx)) + #self.transport.loseConnection() + if self.report: + self.report['mutation_idx'] = mutation_idx + self.report['step_idx'] = step_idx + self.d.callback(None) + return + else: + self.current_step += 1 + if self._current_step_role() == self.role: + # We need to send more data because we are again responsible for + # doing so. + self.sendPayload() + + class Daphn3ClientFactory(protocol.ClientFactory): protocol = daphn3.Daphn3Protocol - def __init__(self, steps): - self.steps = steps + mutation = [0,0] + steps = None def buildProtocol(self, addr): - p = self.protocol(steps=self.steps) + p = self.protocol() + p.steps = self.steps p.factory = self return p def startedConnecting(self, connector): - print "Started connecting %s" % connector + log.msg("Started connecting %s" % connector) def clientConnectionFailed(self, reason, connector): log.err("We failed connecting the the OONIB") @@ -31,8 +55,8 @@ class Daphn3ClientFactory(protocol.ClientFactory): class daphn3Args(usage.Options): optParameters = [ - ['host', 'h', None, 'Target Hostname'], - ['port', 'p', None, 'Target port number']] + ['host', 'h', '127.0.0.1', 'Target Hostname'], + ['port', 'p', 57003, 'Target port number']] optFlags = [['pcap', 'c', 'Specify that the input file is a pcap file'], ['yaml', 'y', 'Specify that the input file is a YAML file (default)']] @@ -68,21 +92,16 @@ class daphn3Test(nettest.NetTestCase): else: daphn3Steps = [{'client': 'testing'}, {'server': 'antani'}] - for idx, step in enumerate(daphn3Steps): - current_packet = step.values()[0] - for mutation_idx in range(len(current_packet)): - if step.keys()[0] == "client": - mutated_step = daphn3.daphn3Mutate(daphn3Steps, - idx, mutation_idx) - yield mutated_step - else: - yield daphn3Steps - - def setUp(self): - self.factory = Daphn3ClientFactory(self.input) - self.factory.report = self.report - print "Just set the factory to %s with %s" % (self.factory, - self.input) + #for idx, step in enumerate(daphn3Steps): + # current_packet = step.values()[0] + # for mutation_idx in range(len(current_packet)): + # if step.keys()[0] == "client": + # mutated_step = daphn3.daphn3Mutate(daphn3Steps, + # idx, mutation_idx) + # yield mutated_step + # else: + # yield daphn3Steps + yield daphn3Steps def test_daphn3(self): host = self.localOptions['host'] @@ -95,11 +114,17 @@ class daphn3Test(nettest.NetTestCase): def success(protocol): log.msg("Successfully connected") - protocol.sendMutation() + protocol.sendPayload() + return protocol.d log.msg("Connecting to %s:%s" % (host, port)) endpoint = endpoints.TCP4ClientEndpoint(reactor, host, port) - d = endpoint.connect(self.factory) + daphn3_factory = Daphn3ClientFactory() + #daphn3_factory.steps = self.input + daphn3_factory.steps = [{'client': 'client_packet'}, + {'server': 'server_packet'}] + daphn3_factory.report = self.report + d = endpoint.connect(daphn3_factory) d.addErrback(failure) d.addCallback(success) return d diff --git a/ooni/kit/daphn3.py b/ooni/kit/daphn3.py index 1c340b4..8d655c3 100644 --- a/ooni/kit/daphn3.py +++ b/ooni/kit/daphn3.py @@ -76,7 +76,7 @@ def read_yaml(filename): class NoInputSpecified(Exception): pass -class StateError(Exception): +class StepError(Exception): pass def daphn3MutateString(string, i): @@ -88,7 +88,7 @@ def daphn3MutateString(string, i): if y == i: mutated += chr(ord(string[i]) + 1) else: - mutated += string[i] + mutated += string[y] return mutated def daphn3Mutate(steps, step_idx, mutation_idx): @@ -109,77 +109,100 @@ def daphn3Mutate(steps, step_idx, mutation_idx): return mutated_steps class Daphn3Protocol(protocol.Protocol): - def __init__(self, steps=None, - yaml_file=None, pcap_file=None, - role="client"): - if yaml_file: - self.steps = read_yaml(yaml_file) - elif pcap_file: - self.steps = read_pcap(pcap_file) - elif steps: - self.steps = steps - else: - raise NoInputSpecified - - # XXX remove me - #self.steps = [{'client': 'antani'}, {'server': 'sblinda'}] - self.role = role - # We use this index to keep track of where we are in the state machine - self.current_step = 0 - - # 0 indicates we are waiting to receive data, while 1 indicates we are - # sending data - self.current_state = 0 - self.current_data_received = 0 - - def sendMutation(self): - self.debug("Sending mutation") - current_step_role = self.steps[self.current_step].keys()[0] - current_step_data = self.steps[self.current_step].values()[0] + steps = None + role = "client" + report = None + # We use this index to keep track of where we are in the state machine + current_step = 0 + current_data_received = 0 + + # We use this to keep track of the mutated steps + mutated_steps = None + d = defer.Deferred() + + def _current_step_role(self): + return self.steps[self.current_step].keys()[0] + + def _current_step_data(self): + step_idx, mutation_idx = self.factory.mutation + log.debug("Mutating %s %s" % (step_idx, mutation_idx)) + mutated_step = daphn3Mutate(self.steps, + step_idx, mutation_idx) + log.debug("Mutated packet into %s" % mutated_step) + return mutated_step[self.current_step].values()[0] + + def sendPayload(self): + self.debug("Sending payload") + current_step_role = self._current_step_role() + current_step_data = self._current_step_data() if current_step_role == self.role: print "In a state to do shit %s" % current_step_data self.transport.write(current_step_data) - self.nextState() + self.nextStep() else: print "Not in a state to do anything" def connectionMade(self): print "Got connection" - self.sendMutation() def debug(self, msg): - print "Current step %s" % self.current_step - print "Current data received %s" % self.current_data_received - print "Current role %s" % self.role - print "Current steps %s" % self.steps - print "Current state %s" % self.current_state - - def nextState(self): - print "Moving on to next state" - self.current_data_received = 0 - self.current_step += 1 - if self.current_step >= len(self.steps): - print "Going to loose this connection" - self.transport.loseConnection() - return - self.sendMutation() + log.debug("Current step %s" % self.current_step) + log.debug("Current data received %s" % self.current_data_received) + log.debug("Current role %s" % self.role) + log.debug("Current steps %s" % self.steps) + log.debug("Current step data %s" % self._current_step_data()) + + def nextStep(self): + """ + XXX this method is overwritten individually by client and server transport. + There is probably a smarter way to do this and refactor the common + code into one place, but for the moment like this is good. + """ + pass def dataReceived(self, data): current_step_role = self.steps[self.current_step].keys()[0] log.debug("Current step role %s" % current_step_role) if current_step_role == self.role: log.debug("Got a state error!") - raise StateError("I should not have gotten data, while I did, \ - perhaps there is a wrong state machine?") + raise StepError("I should not have gotten data, while I did, \ + perhaps there is something wrong with the state machine?") self.current_data_received += len(data) expected_data_in_this_state = len(self.steps[self.current_step].values()[0]) log.debug("Current data received %s" % self.current_data_received) if self.current_data_received >= expected_data_in_this_state: - self.nextState() + self.nextStep() + + def nextMutation(self): + log.debug("Moving onto next mutation") + # [step_idx, mutation_idx] + c_step_idx, c_mutation_idx = self.factory.mutation + log.debug("[%s]: c_step_idx: %s | c_mutation_idx: %s" % (self.role, + c_step_idx, c_mutation_idx)) + + if c_step_idx >= (len(self.steps) - 1): + log.err("No censorship fingerprint bisected.") + log.err("Givinig up.") + self.transport.loseConnection() + return + + # This means we have mutated all bytes in the step + # we should proceed to mutating the next step. + log.debug("steps: %s | %s" % (self.steps, self.steps[c_step_idx])) + if c_mutation_idx >= (len(self.steps[c_step_idx].values()[0]) - 1): + log.debug("Finished mutating step") + # increase step + self.factory.mutation[0] += 1 + # reset mutation idx + self.factory.mutation[1] = 0 + else: + log.debug("Mutating next byte in step") + # increase mutation index + self.factory.mutation[1] += 1 def connectionLost(self, reason): - self.debug("Lost the connection") - print reason + self.debug("--- Lost the connection ---") + self.nextMutation() diff --git a/oonib/config.py b/oonib/config.py index cf2e362..1a70b85 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -27,8 +27,8 @@ helpers.tcp_echo = Storage() helpers.tcp_echo.port = 57002 helpers.daphn3 = Storage() -helpers.daphn3.yaml_file = "/path/to/data/oonib/daphn3.yaml" -helpers.daphn3.pcap_file = "/path/to/data/server.pcap" +#helpers.daphn3.yaml_file = "/path/to/data/oonib/daphn3.yaml" +#helpers.daphn3.pcap_file = "/path/to/data/server.pcap" helpers.daphn3.port = 57003 helpers.dns = Storage() diff --git a/oonib/testhelpers/tcp_helpers.py b/oonib/testhelpers/tcp_helpers.py index 4287a59..4d32ae0 100644 --- a/oonib/testhelpers/tcp_helpers.py +++ b/oonib/testhelpers/tcp_helpers.py @@ -3,7 +3,7 @@ from twisted.internet.protocol import Protocol, Factory, ServerFactory from twisted.internet.error import ConnectionDone from oonib import config - +from ooni.utils import log from ooni.kit.daphn3 import Daphn3Protocol from ooni.kit.daphn3 import read_pcap, read_yaml @@ -17,8 +17,37 @@ class TCPEchoHelper(Factory): """ protocol = TCPEchoProtocol -daphn3Steps = [{'client': '\x00\x00\x00'}, - {'server': '\x00\x00\x00'}] +if config.helpers.daphn3.yaml_file: + daphn3Steps = read_pcap(config.helpers.daphn3.yaml_file) + +elif config.helpers.daphn3.pcap_file: + daphn3Steps = read_yaml(config.helpers.daphn3.pcap_file) + +else: + daphn3Steps = [{'client': 'client_packet'}, + {'server': 'server_packet'}] + +class Daphn3ServerProtocol(Daphn3Protocol): + def nextStep(self): + log.debug("Moving on to next step in the state walk") + self.current_data_received = 0 + # Python why? + if self.current_step >= (len(self.steps) - 1): + log.msg("Reached the end of the state machine") + log.msg("Censorship fingerpint bisected!") + step_idx, mutation_idx = self.factory.mutation + log.msg("step_idx: %s | mutation_id: %s" % (step_idx, mutation_idx)) + #self.transport.loseConnection() + if self.report: + self.report['mutation_idx'] = mutation_idx + self.report['step_idx'] = step_idx + return + else: + self.current_step += 1 + if self._current_step_role() == self.role: + # We need to send more data because we are again responsible for + # doing so. + self.sendPayload() class Daphn3Server(ServerFactory): """ @@ -29,10 +58,15 @@ class Daphn3Server(ServerFactory): two different clients are sharing the same IP, but hopefully the probability of such thing is not that likely. """ - protocol = Daphn3Protocol + protocol = Daphn3ServerProtocol + # step_idx, mutation_idx + mutation = [0, 0] def buildProtocol(self, addr): - p = self.protocol(steps=daphn3Steps, - role="server") + p = self.protocol() + p.steps = daphn3Steps + p.role = "server" p.factory = self return p + +

1 0

[ooni-probe/master] Merge branch 'daphn3port'
by art＠torproject.org 12 Nov '12

12 Nov '12

commit c3f55b7af8d2294a86c953abb6fe0a71f4015d17 Merge: cfab60a 0457513 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 20:13:48 2012 +0100 Merge branch 'daphn3port' * daphn3port: Add unittest for daphn3 mutator. Finish reafactoring and porting daphn3. * XXX not fully tested Progress towards making daphn3 a test helper backend Port daphn3 to be a kit Progress on porting daph3 to new API. The client component Make nettest take a filename instead of a file Trap exceptions that get raised when running tests Add exception logging method Trap exceptions properly in input unit Start rewriting daphn3 Start working on porting of daphn3 nettests/core/daphn3.py | 131 ++++++++++++++++ ooni/kit/daphn3.py | 208 +++++++++++++++++++++++++ ooni/utils/log.py | 6 + oonib/config.py | 5 +- oonib/oonibackend.py | 8 +- oonib/testhelpers/daphn3.py | 47 ------ oonib/testhelpers/tcp_helpers.py | 60 +++++++- tests/test_mutate.py | 15 ++ to-be-ported/old-api/daphn3.py | 152 ------------------- to-be-ported/protocols/daphn3.py | 311 -------------------------------------- 10 files changed, 425 insertions(+), 518 deletions(-)

1 0

[ooni-probe/master] Progress on porting daph3 to new API. The client component
by art＠torproject.org 12 Nov '12

12 Nov '12

commit 1ca2705d208febeea2e8cc400929c170fd875327 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 09:48:08 2012 +0100 Progress on porting daph3 to new API. The client component --- nettests/core/daphn3.py | 122 ++++++++++++++++++++++------------------------- 1 files changed, 57 insertions(+), 65 deletions(-) diff --git a/nettests/core/daphn3.py b/nettests/core/daphn3.py index ed65963..cc4803c 100644 --- a/nettests/core/daphn3.py +++ b/nettests/core/daphn3.py @@ -1,47 +1,33 @@ +# -*- encoding: utf-8 -*- from twisted.python import usage from twisted.internet import protocol, endpoints, reactor +from ooni import nettest from ooni.kit import daphn3 from ooni.utils import log -class Daphn3ClientProtocol(daphn3.Daphn3Protocol): - def connectionMade(self): - self.next_state() - class Daphn3ClientFactory(protocol.ClientFactory): - protocol = Daphn3ClientProtocol - mutator = None - steps = None - test = None + protocol = daphn3.Daphn3Protocol + def __init__(self, steps): + self.steps = steps def buildProtocol(self, addr): - p = self.protocol() + p = self.protocol(steps=self.steps) p.factory = self - p.test = self.test - - if self.steps: - p.steps = self.steps - - if not self.mutator: - self.mutator = daphn3.Mutator(p.steps) + return p - else: - print "Moving on to next mutation" - self.mutator.next() + def startedConnecting(self, connector): + print "Started connecting %s" % connector - p.mutator = self.mutator - p.current_state = self.mutator.state() - return p + def clientConnectionFailed(self, reason, connector): + log.err("We failed connecting the the OONIB") + log.err("Cannot perform test. Perhaps it got blocked?") + log.err("Please report this to tor-assistants(a)torproject.org") - def clientConnectionFailed(self, reason): - print "We failed connecting the the OONIB" - print "Cannot perform test. Perhaps it got blocked?" - print "Please report this to tor-assistants(a)torproject.org" - self.test.result['error'] = ('Failed in connecting to OONIB', reason) - self.test.end(d) + def clientConnectionLost(self, reason, connector): + log.err("Daphn3 client connection lost") + print reason - def clientConnectionLost(self, reason): - print "Connection Lost." class daphn3Args(usage.Options): optParameters = [ @@ -58,57 +44,63 @@ class daphn3Test(nettest.NetTestCase): inputFile = ['file', 'f', None, 'Specify the pcap or YAML file to be used as input to the test'] - requiredOptions = ['file'] + #requiredOptions = ['file'] steps = None def inputProcessor(self, fp): - if self.localOptions['pcap']: - self.steps = daphn3.read_pcap(self.localOptions['pcap']) - else: - self.steps = daphn3.read_yaml(self.localOptions['yaml']) + """ + step_idx is the step in the packet exchange + ex. + [.X.] are packets sent by a client or a server - def setUp(self): - self.factory = Daphn3ClientFactory() - self.factory.test = self + client: [.1.] [.3.] [.4.] + server: [.2.] [.5.] + mutation_idx: is the sub index of the packet as in the byte of the + packet at the step_idx that is to be mutated + + """ if self.localOptions['pcap']: - self.steps = daphn3.read_pcap(self.localOptions['pcap']) + daphn3Steps = daphn3.read_pcap(self.localOptions['pcap']) elif self.localOptions['yaml']: - self.steps = daphn3.read_yaml(self.localOptions['yaml']) + daphn3Steps = daphn3.read_yaml(self.localOptions['yaml']) else: - raise usage.UsageError("You must specify either --pcap or --yaml") - - mutations = 0 - for x in self.steps: - mutations += len(x['data']) - return {'mutation': range(mutations)} + daphn3Steps = [{'client': 'testing'}, {'server': 'antani'}] + + for idx, step in enumerate(daphn3Steps): + current_packet = step.values()[0] + for mutation_idx in range(len(current_packet)): + if step.keys()[0] == "client": + mutated_step = daphn3.daphn3Mutate(daphn3Steps, + idx, mutation_idx) + yield mutated_step + else: + yield daphn3Steps - def control(self, exp_res, args): - try: - mutation = self.factory.mutator.get(0) - self.result['censored'] = False - except: - mutation = None + def setUp(self): + self.factory = Daphn3ClientFactory(self.input) + self.factory.report = self.report + print "Just set the factory to %s with %s" % (self.factory, + self.input) - return {'mutation_number': args['mutation'], - 'value': mutation} + def test_daphn3(self): + host = self.localOptions['host'] + port = int(self.localOptions['port']) - def _failure(self, *argc, **kw): - self.report['censored'] = True - self.report['mutation'] = - self.report['error'] = ('Failed in connecting', (argc, kw)) + def failure(failure): + log.msg("Failed to connect") + self.report['censored'] = True + self.report['mutation'] = 0 - def test_daphn3(self): - log.msg("Doing mutation %s" % args['mutation']) - self.factory.steps = self.steps + def success(protocol): + log.msg("Successfully connected") + protocol.sendMutation() - host = self.local_options['host'] - port = int(self.local_options['port']) log.msg("Connecting to %s:%s" % (host, port)) - endpoint = endpoints.TCP4ClientEndpoint(reactor, host, port) d = endpoint.connect(self.factory) - d.addErrback(self._failure) + d.addErrback(failure) + d.addCallback(success) return d

1 0

[ooni-probe/master] Progress towards making daphn3 a test helper backend
by art＠torproject.org 12 Nov '12

12 Nov '12

commit f6518458a187a97e59539e42a5f4df8db1ba89a6 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 09:49:51 2012 +0100 Progress towards making daphn3 a test helper backend --- oonib/config.py | 1 - oonib/oonibackend.py | 2 +- oonib/testhelpers/tcp_helpers.py | 31 ++++++------------------------- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/oonib/config.py b/oonib/config.py index b34a8ae..cf2e362 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -29,7 +29,6 @@ helpers.tcp_echo.port = 57002 helpers.daphn3 = Storage() helpers.daphn3.yaml_file = "/path/to/data/oonib/daphn3.yaml" helpers.daphn3.pcap_file = "/path/to/data/server.pcap" - helpers.daphn3.port = 57003 helpers.dns = Storage() diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index 4dced2a..937f223 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -53,7 +53,7 @@ if config.helpers.dns.udp_port: # XXX this needs to be ported # Start the OONI daphn3 backend -if config.main.daphn3_port: +if config.helpers.daphn3.port: daphn3_helper = internet.TCPServer(int(config.helpers.daphn3.port), tcp_helpers.Daphn3Server()) daphn3_helper.setServiceParent(serviceCollection) diff --git a/oonib/testhelpers/tcp_helpers.py b/oonib/testhelpers/tcp_helpers.py index 551e880..4287a59 100644 --- a/oonib/testhelpers/tcp_helpers.py +++ b/oonib/testhelpers/tcp_helpers.py @@ -4,7 +4,7 @@ from twisted.internet.error import ConnectionDone from oonib import config -from ooni.kit.daphn3 import Mutator, Daphn3Protocol +from ooni.kit.daphn3 import Daphn3Protocol from ooni.kit.daphn3 import read_pcap, read_yaml class TCPEchoProtocol(Protocol): @@ -17,6 +17,9 @@ class TCPEchoHelper(Factory): """ protocol = TCPEchoProtocol +daphn3Steps = [{'client': '\x00\x00\x00'}, + {'server': '\x00\x00\x00'}] + class Daphn3Server(ServerFactory): """ This is the main class that deals with the daphn3 server side component. @@ -27,31 +30,9 @@ class Daphn3Server(ServerFactory): probability of such thing is not that likely. """ protocol = Daphn3Protocol - mutations = {} def buildProtocol(self, addr): - p = self.protocol() + p = self.protocol(steps=daphn3Steps, + role="server") p.factory = self - - if config.daphn3.yaml_file: - steps = read_yaml(config.daphn3.yaml_file) - elif config.daphn3.pcap_file: - steps = read_pcap(config.daphn3.pcap_file) - else: - print "Error! No PCAP, nor YAML file provided." - steps = None - - p.factory.steps = steps - - if addr.host not in self.mutations: - self.mutations[addr.host] = Mutator(p.steps) - else: - print "Moving on to next mutation" - if not self.mutations[addr.host].next(): - self.mutations.pop(addr.host) - try: - p.mutator = self.mutations[addr.host] - p.current_state = p.mutator.state() - except: - pass return p

1 0

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

12 Nov '12

commit 025a922d9175bea931558e95f687a0e0cdebb524 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 18:45:22 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index e9848ea..bd356b4 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-12 18:05+0000\n" +"PO-Revision-Date: 2012-11-12 18:45+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" @@ -2593,11 +2593,11 @@ msgstr "Mi cortafuegos (firewall) sólo me permite conectarme a ciertos puertos" msgctxt "NetworkPage" msgid "Firewall Settings" -msgstr "Configuración del Cortafuegos (firewall)" +msgstr "Configuración en el Cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "Puertos permitidos:" +msgstr "Puertos a usar permitidos en el cortafuegos:" msgctxt "NetworkPage" msgid "80, 443"

1 0

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

12 Nov '12

commit bf51a4208aedd885083a35d743d671d2ed5cb0a2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 18:45:19 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index e9848ea..bd356b4 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-12 18:05+0000\n" +"PO-Revision-Date: 2012-11-12 18:45+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" @@ -2593,11 +2593,11 @@ msgstr "Mi cortafuegos (firewall) sólo me permite conectarme a ciertos puertos" msgctxt "NetworkPage" msgid "Firewall Settings" -msgstr "Configuración del Cortafuegos (firewall)" +msgstr "Configuración en el Cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "Puertos permitidos:" +msgstr "Puertos a usar permitidos en el cortafuegos:" msgctxt "NetworkPage" msgid "80, 443"

1 0

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

12 Nov '12

commit c4b95d9513a5a697c99c9a390b2100a7ffe23bce Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 18:15:21 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 910cc92..e9848ea 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-12 17:20+0000\n" +"PO-Revision-Date: 2012-11-12 18:05+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" @@ -2585,7 +2585,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por su cortafuegos (firewall)" +msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por su cortafuegos" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports"

1 0

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

12 Nov '12

commit b74134c0ec2d0f7e691f32587128e8206d75faf7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 18:15: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 910cc92..e9848ea 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-12 17:20+0000\n" +"PO-Revision-Date: 2012-11-12 18:05+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" @@ -2585,7 +2585,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por su cortafuegos (firewall)" +msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por su cortafuegos" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports"

1 0

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

12 Nov '12

commit 95ba114bdb04b7faeff110d4d55cf9422f5a5234 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 17:45:22 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index b6910a1..910cc92 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-12 17:14+0000\n" +"PO-Revision-Date: 2012-11-12 17:20+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" @@ -2585,11 +2585,11 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por la configuración de su cortafuegos" +msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por su cortafuegos (firewall)" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" -msgstr "Mi cortafuegos sólo me permite conectarme a ciertos puertos" +msgstr "Mi cortafuegos (firewall) sólo me permite conectarme a ciertos puertos" msgctxt "NetworkPage" msgid "Firewall Settings" @@ -2597,7 +2597,7 @@ msgstr "Configuración del Cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "Puertos Permitidos:" +msgstr "Puertos permitidos:" msgctxt "NetworkPage" msgid "80, 443"

1 0

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

12 Nov '12

commit 3dc8ab014421a3fc2797b0e03e223959d125a581 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 17:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index b6910a1..910cc92 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-12 17:14+0000\n" +"PO-Revision-Date: 2012-11-12 17:20+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" @@ -2585,11 +2585,11 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por la configuración de su cortafuegos" +msgstr "Marque para conectarse sólo con repetidores (relays) que usen puertos permitidos por su cortafuegos (firewall)" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" -msgstr "Mi cortafuegos sólo me permite conectarme a ciertos puertos" +msgstr "Mi cortafuegos (firewall) sólo me permite conectarme a ciertos puertos" msgctxt "NetworkPage" msgid "Firewall Settings" @@ -2597,7 +2597,7 @@ msgstr "Configuración del Cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "Puertos Permitidos:" +msgstr "Puertos permitidos:" msgctxt "NetworkPage" msgid "80, 443"

1 0