- tor-commits - lists.torproject.org

[ooni-probe/master] Implement a working b0wser serveside component
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 32a0027388f4ce5a9404ab02e3e9a21ed9314465 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Jul 10 20:37:38 2012 +0200 Implement a working b0wser serveside component --- oonib/b0wser.py | 113 ++++++++++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 51 deletions(-) diff --git a/oonib/b0wser.py b/oonib/b0wser.py index 072b4b9..186c9a4 100644 --- a/oonib/b0wser.py +++ b/oonib/b0wser.py @@ -3,13 +3,27 @@ from twisted.internet import protocol class Mutator: idx = 0 step = 0 - state = 0 + waiting = False waiting_step = 0 def __init__(self, steps): self.steps = steps + def _mutate(self, data, idx): + """ + Mutate the idx bytes by increasing it's value by one + + @param data: the data to be mutated. + + @param idx: what byte should be mutated. + """ + print "idx: %s, data: %s" % (idx, data) + ret = data[:idx] + ret += chr(ord(data[idx]) + 1) + ret += data[idx+1:] + return ret + def next_mutation(self): """ Increases by one the mutation state. @@ -18,81 +32,74 @@ class Mutator: before [___*] [____] step1 step2 after [____] [*___] + + Should be called every time you need to proceed onto the next mutation. + It changes the internal state of the mutator to that of the next + mutatation. + + returns True if another mutation is available. + returns False if all the possible mutations have been done. """ - current_idx = self.idx + 1 + if self.step > len(self.steps): + self.waiting = True + return False + + self.idx += 1 + current_idx = self.idx current_step = self.step - current_data = self.steps[c_step]['data'] - data_to_receive = self.steps[c_step]]['recv'] + current_data = self.steps[current_step]['data'] + data_to_receive = self.steps[current_step]['wait'] if self.waiting and self.waiting_step == data_to_receive: + print "I am no longer waiting..." self.waiting = False self.waiting_step = 0 + self.idx = 0 elif self.waiting: + print "Waiting some more..." self.waiting_step += 1 - elif current_idx > len(current_data): + elif current_idx >= len(current_data): + print "Entering waiting mode..." self.step += 1 self.idx = 0 self.waiting = True + print "current index %s current data %s" % (current_idx, len(current_data)) + return True - @classmethod - def mutate(data, idx): - """ - Mutate the idx bytes by increasing it's value by one - - @param data: the data to be mutated. - - @param idx: what byte should be mutated. + def get_mutation(self, state): """ - ret = data[:idx-1] - ret += chr(ord(data[idx]) + 1) - ret += data[idx:] - return ret - - def get_mutation(self): - """ - returns the current packet to be sent to the wire. + Returns the current packet to be sent to the wire. If no mutation is necessary it will return the plain data. - """ - self.next_mutation() - if self.state != self.step or self.waiting: - return self.steps[self.state] + Should be called when you are interested in obtaining the data to be + sent for the selected state. - data = self.steps[self.state] - return self.mutate(data, self.idx) + @param step: the current step you want the mutation for - def get_data(self, i): + returns the mutated packet for the specified step. """ - XXX remove this shit. - """ - j = 0 - pkt_size = len(self.steps[j]['data']) - while i > pkt_size: - j += 1 - pkt_size += len(self.steps[j]) - # I am not in a state to send mutations - if j != self.state: - return self.steps[j]['data'] - - rel_idx = i % (pkt_size - len(self.steps[j-1])) - data = self.steps[j] - data[rel_idx] = chr(ord(data[rel_idx]) + 1) - return data + if step != self.step or self.waiting: + print "I am not going to do anything :)" + return self.steps[step]['data'] + + data = self.steps[step]['data'] + print "Mutating %s with idx %s" % (data, self.idx) + return self._mutate(data, self.idx) class B0wserProtocol(protocol.Protocol): - steps = [{'data': "STEP1", 'recv': 20}, - {'data': "STEP2", 'recv': 20}, - {'data': "STEP3", 'recv': 20}] + steps = [{'data': "STEP1", 'wait': 4}, + {'data': "STEP2", 'wait': 4}, + {'data': "STEP3", 'wait': 4}] mutator = None state = 0 received_data = 0 def next_state(self): - data = self.mutator.get_mutation() + data = self.mutator.get_mutation(self.state) self.transport.write(data) - self.mutator.state += 1 + self.state += 1 self.received_data = 0 def dataReceived(self, data): @@ -100,8 +107,8 @@ class B0wserProtocol(protocol.Protocol): self.transport.loseConnection() return self.received_data += len(data) - if self.received_data >= self.steps[self.state]['recv']: - print self.received_data + if self.received_data >= self.steps[self.state]['wait']: + print "Moving to next state %s" % self.state self.next_state() class B0wserServer(protocol.ServerFactory): @@ -112,6 +119,10 @@ class B0wserServer(protocol.ServerFactory): p.factory = self if addr.host not in self.mutations: - self.mutations[addr.host] = Mutation(p.steps) + self.mutations[addr.host] = Mutator(p.steps) + else: + print "Moving on to next mutation" + self.mutations[addr.host].next_mutation() p.mutator = self.mutations[addr.host] return p +

1 0

[ooni-probe/master] Add some documentation to b0wser protocol and server
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 4391e65f226f9b45ceaa08465f466903de14f8e0 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Jul 11 12:54:09 2012 +0200 Add some documentation to b0wser protocol and server --- oonib/b0wser.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/oonib/b0wser.py b/oonib/b0wser.py index 6da1997..4b01cc7 100644 --- a/oonib/b0wser.py +++ b/oonib/b0wser.py @@ -5,6 +5,12 @@ from ooni.plugoo import reports from ooni.protocols.b0wser import Mutator class B0wserProtocol(protocol.Protocol): + """ + This implements the B0wser protocol for the server side. + It gets instanced once for every client that connects to the oonib. + For every instance of protocol there is only 1 mutation. + Once the last step is reached the connection is closed on the serverside. + """ steps = [{'data': "STEP1", 'wait': 4}, {'data': "STEP2", 'wait': 4}, {'data': "STEP3", 'wait': 4}] @@ -16,12 +22,22 @@ class B0wserProtocol(protocol.Protocol): report = reports.Report('b0wser', 'b0wser.yamlooni') def next_state(self): + """ + This is called once I have completed one step of the protocol and need + to proceed to the next step. + """ data = self.mutator.get_mutation(self.state) self.transport.write(data) self.state += 1 self.received_data = 0 def dataReceived(self, data): + """ + This is called every time some data is received. I transition to the + next step once the amount of data that I expect to receive is received. + + @param data: the data that has been sent by the client. + """ if len(self.steps) <= self.state: self.transport.loseConnection() return @@ -31,6 +47,17 @@ class B0wserProtocol(protocol.Protocol): self.next_state() def censorship_detected(self, report): + """ + I have detected the possible presence of censorship we need to write a + report on it. + + @param report: a dict containing the report to be written. Must contain + the keys 'reason', 'proto_state' and 'mutator_state'. + The reason is the reason for which the connection was + closed. The proto_state is the current state of the + protocol instance and mutator_state is what was being + mutated. + """ print "The connection was closed because of %s" % report['reason'] print "I may have matched the censorship fingerprint" print "State %s, Mutator %s" % (report['proto_state'], @@ -39,6 +66,10 @@ class B0wserProtocol(protocol.Protocol): def connectionLost(self, reason): + """ + The connection was closed. This may be because of a legittimate reason + or it may be because of a censorship event. + """ report = {'reason': reason, 'proto_state': self.state, 'mutator_state': self.mutator.state(), 'trigger': None} @@ -53,6 +84,14 @@ class B0wserProtocol(protocol.Protocol): self.censorship_detected(report) class B0wserServer(protocol.ServerFactory): + """ + This is the main class that deals with the b0wser server side component. + We keep track of global state of every client here. + Every client is identified by their IP address and the state of mutation is + stored by using their IP address as a key. This may lead to some bugs if + two different clients are sharing the same IP, but hopefully the + probability of such thing is not that likely. + """ protocol = B0wserProtocol mutations = {} def buildProtocol(self, addr):

1 0

[ooni-probe/master] Half working mutator thing
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 614e7b51762fb99018ab0022b275969c00684b31 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Jul 10 19:37:04 2012 +0200 Half working mutator thing --- oonib/b0wser.py | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ oonib/oonibackend.py | 4 ++ 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/oonib/b0wser.py b/oonib/b0wser.py new file mode 100644 index 0000000..072b4b9 --- /dev/null +++ b/oonib/b0wser.py @@ -0,0 +1,117 @@ +from twisted.internet import protocol + +class Mutator: + idx = 0 + step = 0 + state = 0 + waiting = False + waiting_step = 0 + + def __init__(self, steps): + self.steps = steps + + def next_mutation(self): + """ + Increases by one the mutation state. + + ex. (* is the mutation state, i.e. the byte to be mutated) + before [___*] [____] + step1 step2 + after [____] [*___] + """ + current_idx = self.idx + 1 + current_step = self.step + current_data = self.steps[c_step]['data'] + data_to_receive = self.steps[c_step]]['recv'] + + if self.waiting and self.waiting_step == data_to_receive: + self.waiting = False + self.waiting_step = 0 + + elif self.waiting: + self.waiting_step += 1 + + elif current_idx > len(current_data): + self.step += 1 + self.idx = 0 + self.waiting = True + + @classmethod + def mutate(data, idx): + """ + Mutate the idx bytes by increasing it's value by one + + @param data: the data to be mutated. + + @param idx: what byte should be mutated. + """ + ret = data[:idx-1] + ret += chr(ord(data[idx]) + 1) + ret += data[idx:] + return ret + + def get_mutation(self): + """ + returns the current packet to be sent to the wire. + If no mutation is necessary it will return the plain data. + """ + self.next_mutation() + if self.state != self.step or self.waiting: + return self.steps[self.state] + + data = self.steps[self.state] + return self.mutate(data, self.idx) + + def get_data(self, i): + """ + XXX remove this shit. + """ + j = 0 + pkt_size = len(self.steps[j]['data']) + while i > pkt_size: + j += 1 + pkt_size += len(self.steps[j]) + # I am not in a state to send mutations + if j != self.state: + return self.steps[j]['data'] + + rel_idx = i % (pkt_size - len(self.steps[j-1])) + data = self.steps[j] + data[rel_idx] = chr(ord(data[rel_idx]) + 1) + return data + +class B0wserProtocol(protocol.Protocol): + steps = [{'data': "STEP1", 'recv': 20}, + {'data': "STEP2", 'recv': 20}, + {'data': "STEP3", 'recv': 20}] + + mutator = None + state = 0 + received_data = 0 + + def next_state(self): + data = self.mutator.get_mutation() + self.transport.write(data) + self.mutator.state += 1 + self.received_data = 0 + + def dataReceived(self, data): + if len(self.steps) <= self.state: + self.transport.loseConnection() + return + self.received_data += len(data) + if self.received_data >= self.steps[self.state]['recv']: + print self.received_data + self.next_state() + +class B0wserServer(protocol.ServerFactory): + protocol = B0wserProtocol + mutations = {} + def buildProtocol(self, addr): + p = self.protocol() + p.factory = self + + if addr.host not in self.mutations: + self.mutations[addr.host] = Mutation(p.steps) + p.mutator = self.mutations[addr.host] + return p diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index fc5bbdb..4ae275e 100755 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -18,6 +18,7 @@ from twisted.names import dns from oonib.httpbackend import HTTPBackend from oonib.dnsbackend import ProxyDNSServer +from oonib.b0wser import B0wserServer # This tells twisted to set the server.version = "Apache" @@ -32,3 +33,6 @@ internet.TCPServer(8002, TCPDNSServer).setServiceParent(serviceCollection) UDPFactory = dns.DNSDatagramProtocol(TCPDNSServer) internet.UDPServer(5354, UDPFactory).setServiceParent(serviceCollection) +# Start the ooni backend thing +b0wser = B0wserServer() +internet.TCPServer(9666, b0wser).setServiceParent(serviceCollection)

1 0

[ooni-probe/master] Fix tcpconnect because we were not passing the main reactor to tests
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 41f44d22174b301ca4c896f2891267ef2cdc7797 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Jul 11 15:51:54 2012 +0200 Fix tcpconnect because we were not passing the main reactor to tests Closes #6372 --- ooni/ooniprobe.py | 4 ++-- ooni/plugoo/work.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index 261eb74..d6de6a6 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -56,7 +56,7 @@ def retrieve_plugoo(): plugoo = retrieve_plugoo() -def runTest(test, options, global_options, reactor=None): +def runTest(test, options, global_options, reactor=reactor): """ Run an OONI probe test by name. @@ -68,7 +68,7 @@ def runTest(test, options, global_options, reactor=None): @param global_options: the global options for OONI """ parallelism = int(global_options['parallelism']) - worker = work.Worker(parallelism) + worker = work.Worker(parallelism, reactor=reactor) test_class = plugoo[test].__class__ report = reports.Report(test, global_options['output']) diff --git a/ooni/plugoo/work.py b/ooni/plugoo/work.py index a8b6595..6106456 100644 --- a/ooni/plugoo/work.py +++ b/ooni/plugoo/work.py @@ -24,11 +24,12 @@ class Worker(object): This is the core of OONI. It takes as input Work Units and runs them concurrently. """ - def __init__(self, maxconcurrent=10): + def __init__(self, maxconcurrent=10, reactor=reactor): """ @param maxconcurrent: how many test instances should be run concurrently. """ + self.reactor = reactor self.maxconcurrent = maxconcurrent self._running = 0 self._queued = [] @@ -54,7 +55,7 @@ class Worker(object): r.trap() if self._running == 0 and not self._queued: - reactor.stop() + self.reactor.stop() return r

1 0

[vidalia/alpha] Update changelog date
by chiiph＠torproject.org 11 Jul '12

11 Jul '12

commit 1da9389ceae78ad48ff3f43ed61af8ec39f0ec91 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jul 10 20:16:46 2012 -0300 Update changelog date --- CHANGELOG | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index be1235b..39abc08 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.3.3 09-Jul-12 +0.3.3 10-Jul-12 New features: o Added plugin prototype for Torrc class. This allows plugins to modify the .torrc configuration file.

1 0

[vidalia/master] Bump version to 0.2.20 and update changelog date
by chiiph＠torproject.org 11 Jul '12

11 Jul '12

commit 66a531f01a1149069b3e2f21952744928de7997f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jul 10 20:28:51 2012 -0300 Bump version to 0.2.20 and update changelog date --- CHANGELOG | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 942c027..f485707 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.2.20 09-Jul-2012 +0.2.20 10-Jul-2012 o Append router status information if Tor is using microdescriptors. o Display paths with their native separators. Resolves ticket 4337. o Do not ignore the Show on Startup checkbox. Fixes bug 5351. diff --git a/CMakeLists.txt b/CMakeLists.txt index e58ee6a..2135867 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(VER_MAJOR "0") set(VER_MINOR "2") set(VER_PATCH "20") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/master] Fold in changes
by chiiph＠torproject.org 10 Jul '12

10 Jul '12

commit 5ff9ab39b16ab03f4c2fcc515e54bd0fe24050a3 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jul 10 19:46:00 2012 -0300 Fold in changes --- CHANGELOG | 7 +++++++ changes/appendRouterStatus | 1 - changes/bug4337 | 1 - changes/bug5351 | 1 - changes/bug6178 | 1 - 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1e027e0..942c027 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +0.2.20 09-Jul-2012 + o Append router status information if Tor is using microdescriptors. + o Display paths with their native separators. Resolves ticket 4337. + o Do not ignore the Show on Startup checkbox. Fixes bug 5351. + o Do not add relative root to DataDirectory if it is empty. Fixes + bug 6178. + 0.2.19 30-May-2012 o Disable "Run Vidalia when my system starts" if the BrowserExecutable config option is set. This will avoid issues with diff --git a/changes/appendRouterStatus b/changes/appendRouterStatus deleted file mode 100644 index 7a579d7..0000000 --- a/changes/appendRouterStatus +++ /dev/null @@ -1 +0,0 @@ - o Append router status information if Tor is using microdescriptors. diff --git a/changes/bug4337 b/changes/bug4337 deleted file mode 100644 index f5703d3..0000000 --- a/changes/bug4337 +++ /dev/null @@ -1 +0,0 @@ - o Display paths with their native separators. Resolves ticket 4337. diff --git a/changes/bug5351 b/changes/bug5351 deleted file mode 100644 index b01def8..0000000 --- a/changes/bug5351 +++ /dev/null @@ -1 +0,0 @@ - o Do not ignore the Show on Startup checkbox. Fixes bug 5351. diff --git a/changes/bug6178 b/changes/bug6178 deleted file mode 100644 index e727ed9..0000000 --- a/changes/bug6178 +++ /dev/null @@ -1 +0,0 @@ - o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178.

1 0

[torbutton/master] Add 1506 comments pointed out by Georg.
by mikeperry＠torproject.org 10 Jul '12

10 Jul '12

commit 7d14292f14c24bff161bba4dffd4f5fe20163758 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 10 11:49:10 2012 -0700 Add 1506 comments pointed out by Georg. --- src/chrome/content/contents.rdf | 1 + src/chrome/content/torbutton_util.js | 9 +++++++++ src/chrome/content/torcookie.js | 2 ++ src/chrome/skin/contents.rdf | 1 + src/components/crash-observer.js | 12 ++++++++---- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/contents.rdf b/src/chrome/content/contents.rdf index 5c91f87..c7afa3a 100644 --- a/src/chrome/content/contents.rdf +++ b/src/chrome/content/contents.rdf @@ -1,3 +1,4 @@ + <?xml version="1.0"?> <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index b93162e..b6b4966 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -1,3 +1,8 @@ +// Bug 1506 P0-P3: These utility functions might be useful, but +// you probably just want to rewrite them or use the underlying +// code directly. I don't see any of them as essential for 1506, +// really. + var m_tb_torlog = Components.classes["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; @@ -21,6 +26,7 @@ if(versionChecker.compare(appInfo.version, "5.0a1") >= 0) { } +// Bug 1506 P0: Use the log service directly function torbutton_eclog(nLevel, sMsg) { m_tb_torlog.eclog(nLevel, sMsg); return true; @@ -64,6 +70,9 @@ function torbutton_get_prefbranch(branch_name) { return o_branch; } +// Bug 1506 P3: This would be a semi-polite thing to do on uninstall +// for pure Firefox users. The most polite thing would be to save +// all their original prefs.. But meh? function torbutton_reset_browser_prefs() { var o_all_prefs = torbutton_get_prefbranch(''); var prefs = ["network.http.sendSecureXSiteReferrer", diff --git a/src/chrome/content/torcookie.js b/src/chrome/content/torcookie.js index b57a263..fb8b02c 100644 --- a/src/chrome/content/torcookie.js +++ b/src/chrome/content/torcookie.js @@ -1,3 +1,5 @@ +// Bug 1506 P2: I think cookie protections is a neat feature. + var cookiesTree = null; var prefs = null; var cookies = []; diff --git a/src/chrome/skin/contents.rdf b/src/chrome/skin/contents.rdf index ed9b4c9..53bde17 100644 --- a/src/chrome/skin/contents.rdf +++ b/src/chrome/skin/contents.rdf @@ -1,3 +1,4 @@ + <?xml version="1.0"?> <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" diff --git a/src/components/crash-observer.js b/src/components/crash-observer.js index 96e9bad..776aed5 100644 --- a/src/components/crash-observer.js +++ b/src/components/crash-observer.js @@ -1,4 +1,4 @@ -// Bug 1506 P1-2: This code is mostly hackish remnants of session store +// Bug 1506 P1-3: This code is mostly hackish remnants of session store // support. There are a couple of observer events that *might* be worth // listening to. Search for 1506 in the code. @@ -55,6 +55,8 @@ function CrashObserver() { } if (this.is_ff4) { + // Bug 1506 P2/P3: You probably want to register this observer to clean up + // prefs if you're going to support using normal firefox. Components.utils.import("resource://gre/modules/AddonManager.jsm"); this.onEnabling = this.onOperationCancelled; this.onDisabling = this.onUninstalling; @@ -74,6 +76,8 @@ CrashObserver.prototype = { // us somehow, we will leave the browser in a sorry state... Let's hope they // have the sense not to uninstall addons after an improper shutdown/crash // (or at least give us this event again in that case). + // Bug 1506 P2/P3: You probably want to register this observer to clean up + // prefs if you're going to support using normal firefox. onUninstalling: function(addon, needsRestart) { if (addon.id.toUpperCase() == TORBUTTON_EXTENSION_UUID) { this._uninstall = true; @@ -89,6 +93,8 @@ CrashObserver.prototype = { // This is done in the constructor. JS doesn't allow this... //onDisabling: this.onUninstalling, + // Bug 1506 P2/P3: You probably want to register this observer to clean up + // prefs if you're going to support using normal firefox. onOperationCancelled: function(addon) { if (addon.id.toUpperCase() == TORBUTTON_EXTENSION_UUID) { this.logger.log(4, "Uninstall of Torbutton canceled. Hurray!"); @@ -111,8 +117,6 @@ CrashObserver.prototype = { } this._prefs.setBoolPref("extensions.torbutton.normal_exit", false); } else if (topic == "em-action-requested") { - // Bug 1506 P2/P4: You probably want to register this observer to clean up - // prefs if you're going to support using normal firefox. this.logger.log(3, "Uninstall action requested.."); // http://xulsolutions.blogspot.com/2006/07/creating-uninstall-script-for.html subject.QueryInterface(Components.interfaces.nsIUpdateItem); @@ -127,7 +131,7 @@ CrashObserver.prototype = { } } } else if (topic == "quit-application-granted") { - // Bug 1506 P2/P4: You probably want to register this observer to clean up + // Bug 1506 P2/P3: You probably want to register this observer to clean up // prefs if you're going to support using normal firefox. this.logger.log(3, "Got firefox quit event."); var chrome = null;

1 0

[flashproxy/master] Revert "Remove "CircuitBuildTimeout 60"."
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 6e3ebf3b1e5ad7c762e940ba35b4f5fd991a4ad1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 10 10:56:08 2012 -0700 Revert "Remove "CircuitBuildTimeout 60"." This reverts commit 45509aa495e1f9366ca27fc23587940fb3039692. This seems to be more than just a problem with a warning output. https://trac.torproject.org/projects/tor/ticket/6304#comment:2 --- experiments/exercise/exercise.sh | 2 +- torrc | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 6a91806..13a6107 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & PIDS_TO_KILL+=($!) sleep 60 diff --git a/torrc b/torrc index b04e174..216c292 100644 --- a/torrc +++ b/torrc @@ -8,3 +8,4 @@ UseBridges 1 # The address and port are ignored by the client transport plugin. Bridge websocket 0.0.1.0:1 LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60

1 0

[flashproxy/master] Do another 0.0.0.0 → 0.0.1.0 missed in fdcb2d13.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 38c97d409ed7bd1253546104fbbd4eab2db8ea9d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 10 10:57:24 2012 -0700 Do another 0.0.0.0 → 0.0.1.0 missed in fdcb2d13. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 13a6107..91ab3d7 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & PIDS_TO_KILL+=($!) sleep 60

1 0