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

[stem/master] Tests for the ExitPolicy's __str__ and __iter__ methods
by atagar＠torproject.org 19 Jul '12

19 Jul '12

commit 6d8dcbec4aacfc27ea43e28deea19675c715a28d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 17 09:53:51 2012 -0700 Tests for the ExitPolicy's __str__ and __iter__ methods --- test/unit/exit_policy/policy.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index 5b7324e..da4fc96 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -102,7 +102,27 @@ class TestExitPolicy(unittest.TestCase): policy = ExitPolicy('reject *:80-65535', 'accept *:1-65533', 'reject *:*') self.assertEquals("accept 1-79", policy.summary()) + + def test_str(self): + # sanity test for our __str__ method + + policy = ExitPolicy(' accept *:80\n', '\taccept *:443') + self.assertEquals("accept *:80, accept *:443", str(policy)) + + policy = ExitPolicy('reject 0.0.0.0/255.255.255.0:*', 'accept *:*') + self.assertEquals("reject 0.0.0.0/24:*, accept *:*", str(policy)) + + def test_iter(self): + # sanity test for our __iter__ method + + rules = [ + ExitPolicyRule('accept *:80'), + ExitPolicyRule('accept *:443'), + ExitPolicyRule('reject *:*'), + ] + self.assertEquals(rules, list(ExitPolicy(*rules))) + self.assertEquals(rules, list(ExitPolicy('accept *:80', 'accept *:443', 'reject *:*'))) def test_microdesc_exit_parsing(self):

1 0

[stem/master] Dropping the ExitPolicy's test_parsing()
by atagar＠torproject.org 19 Jul '12

19 Jul '12

commit 22ec4c9226da797778f56d8d1303b61c4e3bf710 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 17 09:29:32 2012 -0700 Dropping the ExitPolicy's test_parsing() The test_parsing() test is redundant with the ExitPolicyRule tests, so dropping it. --- test/unit/exit_policy/policy.py | 35 ----------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index 8b74998..97cad1a 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -89,41 +89,6 @@ class TestExitPolicy(unittest.TestCase): self.assertEquals(expected_result, policy.is_exiting_allowed()) - def test_parsing(self): - """ - Tests parsing by the ExitPolicy class constructor. - """ - - exit_policies = stem.exit_policy.ExitPolicy("accept *:80", "accept *:443", "reject *:*") - self.assertEqual(str(exit_policies), "accept *:80, accept *:443, reject *:*") - - exit_policies = stem.exit_policy.ExitPolicy() - - # check ip address - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept 256.255.255.255:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept -10.255.255.255:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept 255.-10.255.255:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept 255.255.-10.255:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept -255.255.255.-10:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept a.b.c.d:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept 255.255.255:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept -255.255:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept 255:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept -:80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept :80") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept ...:80") - - # check input string - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "foo 255.255.255.255:80") - - # check ports - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept *:0001") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept *:-1") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept *:+1") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept *:+1-1") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept *:a") - self.assertRaises(ValueError, stem.exit_policy.ExitPolicy, "accept *:70000") - def test_microdesc_exit_parsing(self): microdesc_exit_policy = stem.exit_policy.MicrodescriptorExitPolicy("accept 80,443")

1 0

[stem/master] Minor post-rebase revisions
by atagar＠torproject.org 19 Jul '12

19 Jul '12

commit e6700902cd914922515f17179ee1e8e97a5af507 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 19 08:55:30 2012 -0700 Minor post-rebase revisions Just a couple things I spotted after rebasing my exit_policy branch onto the current master. --- stem/exit_policy.py | 2 +- stem/util/connection.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 49a6cef..0337a6b 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -27,7 +27,7 @@ exiting to a destination is permissable or not. For instance... |- summary - provides a short label, similar to a microdescriptor |- __str__ - string representation +- __iter__ - ExitPolicyRule entries that this contains - + ExitPolicyRule - Single rule of an exit policy chain |- is_address_wildcard - checks if we'll accept any address |- is_port_wildcard - checks if we'll accept any port diff --git a/stem/util/connection.py b/stem/util/connection.py index e1e8890..eda3569 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -15,6 +15,9 @@ but for now just moving the parts we need. get_mask_ipv6 - provides the IPv6 mask representation for a given number of bits get_binary - provides the binary representation for an integer with padding get_address_binary - provides the binary representation for an address + + hmac_sha256 - provides a sha256 digest + cryptovariables_equal - string comparison for cryptographic operations """ import os

1 0

[stem/master] Revised MicrodescriptorExitPolicy
by atagar＠torproject.org 19 Jul '12

19 Jul '12

commit af9e5b4e9f4dcb149d37c7f7ad0249abaa56e689 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 18 09:55:06 2012 -0700 Revised MicrodescriptorExitPolicy Rewrite the MicrodescriptorExitPolicy and expanded its tests. --- stem/exit_policy.py | 160 ++++++++++++++++++++++----------------- test/unit/exit_policy/policy.py | 89 +++++++++++++++++----- 2 files changed, 160 insertions(+), 89 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 8a5f528..49a6cef 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -15,15 +15,13 @@ exiting to a destination is permissable or not. For instance... >>> policy = stem.exit_policy.MicrodescriptorExitPolicy("accept 80,443") >>> print policy accept 80,443 - >>> policy.check("www.google.com", 80) - True - >>> policy.check(80) + >>> policy.check("75.119.206.243", 80) True :: ExitPolicy - Exit policy for a Tor relay - |- set_default_allowed - sets the default can_exit_to() response if no rules apply + | + MicrodescriptorExitPolicy - Microdescriptor exit policy |- can_exit_to - check if exiting to this destination is allowed or not |- is_exiting_allowed - check if any exiting is allowed |- summary - provides a short label, similar to a microdescriptor @@ -35,12 +33,6 @@ exiting to a destination is permissable or not. For instance... |- is_port_wildcard - checks if we'll accept any port |- is_match - checks if we match a given destination +- __str__ - string representation for this rule - - MicrodescriptorExitPolicy - Microdescriptor exit policy - |- check - check if exiting to this port is allowed - |- ports - returns a list of ports - |- is_accept - check if it's a list of accepted/rejected ports - +- __str__ - return the summary """ import stem.util.connection @@ -236,6 +228,94 @@ class ExitPolicy(object): else: return False +class MicrodescriptorExitPolicy(ExitPolicy): + """ + Exit policy provided by the microdescriptors. This is a distilled version of + a normal ExitPolicy contains, just consisting of a list of ports that are + either accepted or rejected. For instance... + + :: + + accept 80,443 # only accepts common http ports + reject 1-1024 # only accepts non-privilaged ports + + Since these policies are a subset of the exit policy information (lacking IP + ranges) clients can only use them to guess if a relay will accept traffic or + not. To quote the dir-spec (section 3.2.1)... + + :: + + With microdescriptors, clients don't learn exact exit policies: + clients can only guess whether a relay accepts their request, try the + BEGIN request, and might get end-reason-exit-policy if they guessed + wrong, in which case they'll have to try elsewhere. + + :var set ports: ports that this policy includes + :var bool is_accept: True if these are ports that we accept, False if they're ports that we reject + + :param str policy: policy string that describes this policy + """ + + def __init__(self, policy): + # Microdescriptor policies are of the form... + # + # MicrodescriptrPolicy ::= ("accept" / "reject") SP PortList NL + # PortList ::= PortOrRange + # PortList ::= PortList "," PortOrRange + # PortOrRange ::= INT "-" INT / INT + + self.ports = set() + self._policy = policy + + if policy.startswith("accept"): + self.is_accept = True + elif policy.startswith("reject"): + self.is_accept = False + else: + raise ValueError("A microdescriptor exit policy must start with either 'accept' or 'reject': %s" % policy) + + policy = policy[6:] + + if not policy.startswith(" ") or (len(policy) - 1 != len(policy.lstrip())): + raise ValueError("A microdescriptor exit policy should have a space separating accept/reject from its port list: %s" % self._policy) + + policy = policy[1:] + + # convert our port list into ExitPolicyRules + rules = [] + rule_format = "accept *:%s" if self.is_accept else "reject *:%s" + + for port_entry in policy.split(","): + rule_str = rule_format % port_entry + + try: + rule = ExitPolicyRule(rule_str) + self.ports.update(range(rule.min_port, rule.max_port + 1)) + rules.append(rule) + except ValueError, exc: + exc_msg = "Policy '%s' is malformed. %s" % (self._policy, str(exc).replace(rule_str, port_entry)) + raise ValueError(exc_msg) + + super(MicrodescriptorExitPolicy, self).__init__(*rules) + + def can_exit_to(self, address = None, port = None): + # we can greatly simplify our check since our policies don't concern + # addresses or masks + + if port in self.ports: + return self.is_accept + else: + return not self.is_accept + + def __str__(self): + return self._policy + + def __eq__(self, other): + if isinstance(other, MicrodescriptorExitPolicy): + return str(self) == str(other) + else: + return False + class ExitPolicyRule(object): """ Single rule from the user's exit policy. These rules are chained together to @@ -281,7 +361,7 @@ class ExitPolicyRule(object): exitpattern = rule[6:] - if not exitpattern.startswith(" ") or (len(exitpattern) - 1 != len(exitpattern.lstrip())) : + if not exitpattern.startswith(" ") or (len(exitpattern) - 1 != len(exitpattern.lstrip())): raise ValueError("An exit policy should have a space separating its accept/reject from the exit pattern: %s" % rule) exitpattern = exitpattern[1:] @@ -522,62 +602,4 @@ class ExitPolicyRule(object): return str(self) == str(other) else: return False - -class MicrodescriptorExitPolicy: - """ - Microdescriptor exit policy - 'accept 53,80,443' - """ - - def __init__(self, summary): - self.ports = [] - self.is_accept = None - self.summary = summary - - # sanitize the input a bit, cleaning up tabs and stripping quotes - summary = self.summary.replace("\\t", " ").replace("\"", "") - - self.is_accept = summary.startswith("accept") - - # strips off "accept " or "reject " and extra spaces - summary = summary[7:].replace(" ", "") - - for ports in summary.split(','): - if '-' in ports: - port_range = ports.split("-", 1) - if not stem.util.connection.is_valid_port(port_range): - raise ValueError("Invaid port range") - self.ports.append(range(int(port_range[2])), int(port_range[1])) - if not stem.util.connection.is_valid_port(ports): - raise ValueError("Invalid port range") - self.ports.append(int(ports)) - - def check(self, ip_address=None, port=None): - # stem is intelligent about the arguments - if not port: - if not '.' in str(ip_address): - port = ip_address - - port = int(port) - - if port in self.ports: - # its a list of accepted ports - if self.is_accept: - return True - else: - return False - else: - # its a list of rejected ports - if not self.is_accept: - return True - else: - return False - - def __str__(self): - return self.summary - - def ports(self): - return self.ports - - def is_accept(self): - return self.is_accept diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index da4fc96..6ce0e4f 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -5,7 +5,9 @@ Unit tests for the stem.exit_policy.ExitPolicy class. import unittest import stem.exit_policy import stem.util.system -from stem.exit_policy import ExitPolicy, ExitPolicyRule +from stem.exit_policy import ExitPolicy, \ + MicrodescriptorExitPolicy, \ + ExitPolicyRule import test.mocking as mocking @@ -17,7 +19,8 @@ class TestExitPolicy(unittest.TestCase): self.assertEquals("accept 80, 443", policy.summary()) self.assertTrue(policy.can_exit_to("75.119.206.243", 80)) - # TODO: add MicrodescriptorExitPolicy after it has been revised + policy = MicrodescriptorExitPolicy("accept 80,443") + self.assertTrue(policy.can_exit_to("75.119.206.243", 80)) def test_constructor(self): # The ExitPolicy constructor takes a series of string or ExitPolicyRule @@ -124,25 +127,71 @@ class TestExitPolicy(unittest.TestCase): self.assertEquals(rules, list(ExitPolicy(*rules))) self.assertEquals(rules, list(ExitPolicy('accept *:80', 'accept *:443', 'reject *:*'))) - - def test_microdesc_exit_parsing(self): - microdesc_exit_policy = stem.exit_policy.MicrodescriptorExitPolicy("accept 80,443") - - self.assertEqual(str(microdesc_exit_policy),"accept 80,443") + def test_microdescriptor_parsing(self): + # mapping between inputs and if they should succeed or not + test_inputs = { + 'accept 80': True, + 'accept 80,443': True, + '': False, + 'accept': False, + 'accept ': False, + 'accept\t80,443': False, + 'accept 80, 443': False, + 'accept 80,\t443': False, + '80,443': False, + 'accept 80,-443': False, + 'accept 80,+443': False, + 'accept 80,66666': False, + 'reject 80,foo': False, + 'bar 80,443': False, + } - self.assertRaises(ValueError, stem.exit_policy.MicrodescriptorExitPolicy, "accept 80,-443") - self.assertRaises(ValueError, stem.exit_policy.MicrodescriptorExitPolicy, "accept 80,+443") - self.assertRaises(ValueError, stem.exit_policy.MicrodescriptorExitPolicy, "accept 80,66666") - self.assertRaises(ValueError, stem.exit_policy.MicrodescriptorExitPolicy, "reject 80,foo") - self.assertRaises(ValueError, stem.exit_policy.MicrodescriptorExitPolicy, "bar 80,foo") - self.assertRaises(ValueError, stem.exit_policy.MicrodescriptorExitPolicy, "foo") - self.assertRaises(ValueError, stem.exit_policy.MicrodescriptorExitPolicy, "bar 80-foo") + for policy_arg, expect_success in test_inputs.items(): + try: + policy = MicrodescriptorExitPolicy(policy_arg) + + if expect_success: + self.assertEqual(policy_arg, str(policy)) + else: + self.fail() + except ValueError: + if expect_success: self.fail() + + def test_microdescriptor_attributes(self): + # checks that its is_accept and ports attributes are properly set + + # single port + policy = MicrodescriptorExitPolicy('accept 443') + self.assertTrue(policy.is_accept) + self.assertEquals(set([443]), policy.ports) + + # multiple ports + policy = MicrodescriptorExitPolicy('accept 80,443') + self.assertTrue(policy.is_accept) + self.assertEquals(set([80, 443]), policy.ports) + + # port range + policy = MicrodescriptorExitPolicy('reject 1-1024') + self.assertFalse(policy.is_accept) + self.assertEquals(set(range(1, 1025)), policy.ports) + + def test_microdescriptor_can_exit_to(self): + test_inputs = { + 'accept 443': {442: False, 443: True, 444: False}, + 'reject 443': {442: True, 443: False, 444: True}, + 'accept 80,443': {80: True, 443: True, 10: False}, + 'reject 1-1024': {1: False, 1024: False, 1025: True}, + } - def test_micodesc_exit_check(self): - microdesc_exit_policy = stem.exit_policy.MicrodescriptorExitPolicy("accept 80,443") + for policy_arg, attr in test_inputs.items(): + policy = MicrodescriptorExitPolicy(policy_arg) + + for port, expected_value in attr.items(): + self.assertEqual(expected_value, policy.can_exit_to(port = port)) - self.assertTrue(microdesc_exit_policy.check(80)) - self.assertTrue(microdesc_exit_policy.check("www.atagar.com", 443)) + # address argument should be ignored + policy = MicrodescriptorExitPolicy('accept 80,443') - self.assertFalse(microdesc_exit_policy.check(22)) - self.assertFalse(microdesc_exit_policy.check("www.atagar.com", 8118)) + self.assertFalse(policy.can_exit_to('blah', 79)) + self.assertTrue(policy.can_exit_to('blah', 80)) +

1 0

[stem/master] Adding an ExitPolicy class
by atagar＠torproject.org 19 Jul '12

19 Jul '12

commit 78a997ea34aaee8cc4515382fb0f0ec4814c32a4 Merge: e68adb7 e670090 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 19 08:58:07 2012 -0700 Adding an ExitPolicy class First draft was ported from arm by gsathya in... https://trac.torproject.org/5454 I've since rewritten most of it to support IPv6, masks, and properly comply with the Tor spec for an exitpattern (arm's class was written to support torrc policies, which are different). run_tests.py | 4 + stem/descriptor/server_descriptor.py | 7 +- stem/exit_policy.py | 605 ++++++++++++++++++++++++++++ stem/util/connection.py | 173 ++++++++- test/integ/descriptor/server_descriptor.py | 7 +- test/unit/exit_policy/__init__.py | 6 + test/unit/exit_policy/policy.py | 197 +++++++++ test/unit/exit_policy/rule.py | 327 +++++++++++++++ test/unit/util/connection.py | 77 ++++ 9 files changed, 1395 insertions(+), 8 deletions(-)

1 0

[stem/master] Using the ExitPolicy class for ServerDescriptors
by atagar＠torproject.org 19 Jul '12

19 Jul '12

commit 59ed7fdd4f90fe6ac804b7b24dfdc0c3f2bc68dd Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 19 08:47:43 2012 -0700 Using the ExitPolicy class for ServerDescriptors The ServerDescriptor class had a todo item to replace the lists of strings that it was using for an exit policy with the ExitPolicy class when we had one. Making it so... --- stem/descriptor/server_descriptor.py | 7 +++++-- test/integ/descriptor/server_descriptor.py | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index fc15a3d..730709f 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -35,6 +35,7 @@ import datetime import stem.prereq import stem.descriptor import stem.descriptor.extrainfo_descriptor +import stem.exit_policy import stem.version import stem.util.log as log import stem.util.connection @@ -204,7 +205,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): self.operating_system = None self.uptime = None self.contact = None - self.exit_policy = [] # should be an ExitPolicy instance when we have the class... + self.exit_policy = None self.family = [] self.average_bandwidth = None @@ -241,8 +242,10 @@ class ServerDescriptor(stem.descriptor.Descriptor): # influences the resulting exit policy, but for everything else the order # does not matter so breaking it into key / value pairs. - entries, first_keyword, last_keyword, self.exit_policy = \ + entries, first_keyword, last_keyword, policy = \ stem.descriptor._get_descriptor_components(raw_contents, validate, ("accept", "reject")) + + self.exit_policy = stem.exit_policy.ExitPolicy(*policy) self._parse(entries, validate) if validate: self._check_constraints(entries, first_keyword, last_keyword) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 7a3e2e6..38d633c 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -9,6 +9,7 @@ import datetime import unittest import stem.control +import stem.exit_policy import stem.version import stem.descriptor.server_descriptor import test.runner @@ -80,7 +81,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(153600, desc.average_bandwidth) self.assertEquals(256000, desc.burst_bandwidth) self.assertEquals(104590, desc.observed_bandwidth) - self.assertEquals(["reject *:*"], desc.exit_policy) + self.assertEquals(stem.exit_policy.ExitPolicy("reject *:*"), desc.exit_policy) self.assertEquals(expected_onion_key, desc.onion_key) self.assertEquals(expected_signing_key, desc.signing_key) self.assertEquals(expected_signature, desc.signature) @@ -211,7 +212,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(81920, desc.average_bandwidth) self.assertEquals(102400, desc.burst_bandwidth) self.assertEquals(84275, desc.observed_bandwidth) - self.assertEquals(["reject *:*"], desc.exit_policy) + self.assertEquals(stem.exit_policy.ExitPolicy("reject *:*"), desc.exit_policy) self.assertEquals([], desc.get_unrecognized_lines()) def test_cr_in_contact_line(self): @@ -309,7 +310,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(409600, desc.average_bandwidth) self.assertEquals(819200, desc.burst_bandwidth) self.assertEquals(5120, desc.observed_bandwidth) - self.assertEquals(["reject *:*"], desc.exit_policy) + self.assertEquals(stem.exit_policy.ExitPolicy("reject *:*"), desc.exit_policy) self.assertEquals("006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4", desc.digest()) self.assertEquals([], desc.get_unrecognized_lines())

1 0

[flashproxy/master] Add "CircuitBuildTimeout 60" to the public plugin example to match torrc.
by dcf＠torproject.org 19 Jul '12

19 Jul '12

commit 429c4b322cb21e28cc6f5d6d78c319c30f8bd39b Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 17 13:29:06 2012 -0700 Add "CircuitBuildTimeout 60" to the public plugin example to match torrc. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index b8b2f5c..2b4b5a9 100644 --- a/README +++ b/README @@ -77,7 +77,7 @@ public instance of it. This way is not as realistic because all your Tor traffic will first go to a fixed address and can be easily blocked. However this is an easy way to try out the system without having to do port forwarding. - $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 + $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 == Troubleshooting

1 0

[tor/master] Avoid double-typedef of transport_t.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit 24451e6f7d6813642cc3b092bf085fdbb4a9aefc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 09:04:24 2012 -0400 Avoid double-typedef of transport_t. You can say "struct foo_t" as much as you want, but you'd better not have "typedef struct foo_t foo_t" more than once. Fix for bug 6416. Bug not in any released version of Tor. --- src/or/circuitbuild.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index a7becce..d4a78b9 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -137,9 +137,9 @@ int circuit_build_times_get_bw_scale(networkstatus_t *ns); /* DOCDOC find_transport_name_by_bridge_addrport */ const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); -typedef struct transport_t transport_t; +struct transport_t; int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, - const transport_t **transport); + const struct transport_t **transport); #endif

1 0

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

19 Jul '12

commit 0bdf8ae000da76d71173f8cadd833945c991aeda Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 19 09:15:11 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index d73294d..3eafd48 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -7,7 +7,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-07-19 08:45+0000\n" +"PO-Revision-Date: 2012-07-19 09:10+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1983,17 +1983,17 @@ msgstr "Tor ayarlarını geri yükle" msgctxt "MainWindow" msgid "Actions" -msgstr "" +msgstr "Eylemler" msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "Torrc %1 'den %2' ye önyükleniyor." msgctxt "MainWindow" msgid "" "Vidalia tried to restart Tor, but was not able to. Please check your Task " "Manager to ensure there are no other Tor processes running." -msgstr "" +msgstr "Vidalia Tor 'u yeniden başlatmayı denedi, ancak başaramadı. Lütfen çalışan başka bir tor işlemi olmadığından " msgctxt "MainWindow" msgid "Error reloading configuration"

1 0

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

19 Jul '12

commit 4cbde66b1a17c268073269c9ff2381bc4904e29e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 19 08:45:13 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index cd613e0..d73294d 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -7,7 +7,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-07-19 06:53+0000\n" +"PO-Revision-Date: 2012-07-19 08:45+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -488,7 +488,7 @@ msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia can try to restart Tor for you. Doing so will close all currently " "active connections through your Tor process." -msgstr "" +msgstr "Vidalia Tor 'u sizin yerinize yeniden başlatmayı deneyebilir. Bunu yapmak Tor işlemlerinde şu anda aktif olan bütün bağlantıları kapatacaktır." msgctxt "ControlPasswordInputDialog" msgid "" @@ -501,7 +501,7 @@ msgctxt "ControlPasswordInputDialog" msgid "" "You will need to shut down the Tor process before Vidalia can launch a new " "one." -msgstr "" +msgstr "Vidalia yeni bir Tor işlemi başlatabilmesi için mevcut olanı kapatmalısınız." msgctxt "ControlSocket" msgid "Control socket is not connected." @@ -1217,7 +1217,7 @@ msgstr "Zimbabwe" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "Kongo Demotratik Cumhuriyeti" msgctxt "CountryInfo" msgid "Albania" @@ -1317,29 +1317,29 @@ msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Çökme Raporu Gönder" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia bir hata ile karşılaştı ve kapatılması gerekiyor" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Vidalia 'yı Yeniden başlat" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Yeniden Başlatma" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Vidalia yeniden başlatılamıyor" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." -msgstr "" +msgstr "Vidalia otomatik olarak yeniden başlatılamadı. Lütfen Vidalia 'yı manuel olarak yeniden başlatınız." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1418,7 +1418,7 @@ msgstr "Şimdi kontrol et" msgctxt "GeneralPage" msgid "Connect to Tor automatically" -msgstr "" +msgstr "Tor 'a otomatik olarak bağlan" msgctxt "GraphFrame" msgid "%1 KB/s" @@ -1639,27 +1639,27 @@ msgstr "Bilinmeyen" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Hata Giderme" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Bilgi" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "Bildiri" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Uyarı" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Hata" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Bilinmeyen" msgctxt "MainWindow" msgid "Start Tor" @@ -1967,19 +1967,19 @@ msgid "" "Anything sent over this connection could be monitored. Please check your " "application's configuration and use only encrypted protocols, such as SSL, " "if possible." -msgstr "" +msgstr "Bu bağlantı üzerinden gönderilen herşey izlenebilir. Lütfen uygulamanızın ayarlarını kontrol edin ve mümükün ise sadece SSL gibi şifrelenmiş protokolleri kullanınız." msgctxt "MainWindow" msgid "toolBar" -msgstr "" +msgstr "Araç Çubuğu" msgctxt "MainWindow" msgid "Restart" -msgstr "" +msgstr "Yeniden Başlat" msgctxt "MainWindow" msgid "Reload Tor's config" -msgstr "" +msgstr "Tor ayarlarını geri yükle" msgctxt "MainWindow" msgid "Actions"

1 0