- tor-commits - lists.torproject.org

[atlas/master] Make exitpolicies scroll
by karsten＠torproject.org 15 Sep '12

15 Sep '12

commit 3234789e8170ae3f7d27c7463cdf84b9424b33e1 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Sep 15 08:31:37 2012 +0530 Make exitpolicies scroll --- css/bootstrap.css | 6 ++++++ templates/details/main.html | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/css/bootstrap.css b/css/bootstrap.css index 250ee39..e60bb20 100644 --- a/css/bootstrap.css +++ b/css/bootstrap.css @@ -492,6 +492,12 @@ pre { pre.prettyprint { margin-bottom: 18px; } + +pre.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} + pre code { padding: 0; background-color: transparent; diff --git a/templates/details/main.html b/templates/details/main.html index 088b6b8..b8b5421 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -33,15 +33,15 @@ <dt><span class="tip" data-content="Port summary of exit connections that the relay is going to accept or reject." data-original-title="Exit policy summary">Exit Policy Summary</span></dt> <dd> <% if ('accept' in relay.get('exit_policy_summary')) { %> - <pre>accept<% _.each(relay.get('exit_policy_summary')['accept'], + <pre class="pre-scrollable">accept<% _.each(relay.get('exit_policy_summary')['accept'], function(ports) { %><br> <%= $.trim(ports) %><% });} %></pre> <% if ('reject' in relay.get('exit_policy_summary')) { %> - <pre>reject<% _.each(relay.get('exit_policy_summary')['reject'], + <pre class="pre-scrollable">reject<% _.each(relay.get('exit_policy_summary')['reject'], function(ports) { %><br> <%= $.trim(ports) %><% });} %></pre> </dd> <dt><span class="tip" data-content="Policy of exit connections that the relay is going to accept or reject." data-original-title="Exit policy">Exit Policy</span></dt> <dd> - <pre><% _.each(relay.get('exit_policy'), function(line) { %> + <pre class="pre-scrollable"><% _.each(relay.get('exit_policy'), function(line) { %> <%= $.trim(line) %><% }); %></pre> </dd> </dl>

1 0

[ooni-probe/master] * Modified exception handling in bridget so that ImportErrors from missing
by isis＠torproject.org 15 Sep '12

15 Sep '12

commit 803e24021cc9a1d48eaa4c24b3e19d39bc8be11b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 15 03:09:22 2012 +0000 * Modified exception handling in bridget so that ImportErrors from missing OONI libraries don't clutter the logs. * Removed txtorcon directory and modified the Makefile so that git clones dependencies correctly. * Modified class and import structures in bridget so that txtorcon doesn't get imported until used, and ImportErrors and missing libraries give instructions on how to fix any problems. --- ooni/lib/Makefile | 18 ++- ooni/lib/txtorcon | 1 - ooni/plugins/bridget.py | 268 +++++++++++++++++++++++++---------------------- 3 files changed, 153 insertions(+), 134 deletions(-) diff --git a/ooni/lib/Makefile b/ooni/lib/Makefile index 3b0c922..c40b8d2 100644 --- a/ooni/lib/Makefile +++ b/ooni/lib/Makefile @@ -1,4 +1,4 @@ -all: txtorcon txtraceroute +all: txtorcon txtraceroute: echo "Processing dependency txtraceroute..." @@ -14,13 +14,19 @@ txtorcon: clean: rm -rf txtorcon +# rm -rf txtraceroute.py +# rm -rf txscapy.py + +cleanall: + rm -rf txtorcon rm -rf txtraceroute.py + rm -rf txscapy.py -#txscapy: -# echo "Processing dependency txscapy" -# git clone https://github.com/hellais/txscapy.git txscapy.git -# mv txscapy.git/txscapy.py txscapy.py -# rm -rf txscapy.git +txscapy: + echo "Processing dependency txscapy" + git clone https://github.com/hellais/txscapy.git txscapy.git + mv txscapy.git/txscapy.py txscapy.py + rm -rf txscapy.git #rfc3339: # echo "Processing RFC3339 dependency" diff --git a/ooni/lib/txtorcon b/ooni/lib/txtorcon deleted file mode 160000 index def1551..0000000 --- a/ooni/lib/txtorcon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit def155177f4ba6fd0728922e5b6f3c0066006a94 diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index 95f7453..be39371 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -13,33 +13,28 @@ # :version: 0.1.0-alpha from __future__ import with_statement -from zope.interface import implements +from os import getcwd +from os.path import isfile +from os.path import join as pj from twisted.python import usage from twisted.plugin import IPlugin from twisted.internet import defer, error, reactor +from zope.interface import implements import random import sys -try: - from ooni.lib.txtorcon import CircuitListenerMixin, IStreamAttacher -except: - print "BridgeT requires txtorcon: https://github.com/meejah/txtorcon.git" - print "Your copy of OONI should have it included, if you're seeing this" - print "message, please file a bug report." - log.msg ("Bridget: Unable to import from ooni.lib.txtorcon") - from ooni.utils import log from ooni.plugoo.tests import ITest, OONITest from ooni.plugoo.assets import Asset class BridgetArgs(usage.Options): - def portCheck(number): number = int(number) if number not in range(1024, 65535): raise ValueError("Port out of range") + portCheck.coerceDoc = "Ports must be between 1024 and 65535" optParameters = [ @@ -72,93 +67,6 @@ class BridgetArgs(usage.Options): e = "Unable to use random and specific ports simultaneously" raise usageError, e -class CustomCircuit(CircuitListenerMixin): - implements(IStreamAttacher) - - from txtorcon.interface import IRouterContainer, ICircuitContainer - - def __init__(self, state): - self.state = state - self.waiting_circuits = [] - - def waiting_on(self, circuit): - for (circid, d) in self.waiting_circuits: - if circuit.id == circid: - return true - return False - - def circuit_extend(self, circuit, router): - "ICircuitListener" - if circuit.purpose != 'GENERAL': - return - if self.waiting_on(circuit): - log.msg("Circuit %d (%s)" % (circuit.id, router.id_hex)) - - def circuit_built(self, circuit): - "ICircuitListener" - if circuit.purpose != 'GENERAL': - return - - log.msg("Circuit %s built ..." % circuit.id) - log.msg("Full path of %s: %s" % (circuit.id, circuit.path)) - - for (circid, d) in self.waiting_circuits: - if circid == circuit.id: - self.waiting_circuits.remove(circid, d) - d.callback(circuit) - - def circuit_failed(self, circuit, reason): - if self.waiting_on(circuit): - log.msg("A circuit we requested %s failed for reason %s" % - (circuit.id, reason)) - circid, d = None, None - for x in self.waiting_circuits: - if x[0] == circuit.id: - circid, d, stream_cc = x - if d is None: - raise Exception("Expected to find circuit.") - - self.waiting_circuits.remove((circid, d)) - log.msg("Trying to build a circuit for %s" % circid) - self.request_circuit_build(d) - - def check_circuit_route(self, circuit, router): - if router in circuit.path: - #router.update() ## XXX can i use without args? no. - TorInfo.dump(self) - - def request_circuit_build(self, deferred): - entries = self.state.entry_guards.value() - relays = self.state.routers.values() - - log.msg("We have these nodes listed as entry guards:") - log.msg("%s" % entries) - log.msg("We have these nodes listed as relays:") - log.msg("%s" % relays) - - path = [random.choice(entries), - random.choice(relays), - random.choice(relays)] - - log.msg("Requesting a circuit: %s" - % '-->'.join(map(lambda x: x.location.countrycode, path))) - - class AppendWaiting: - def __init__(self, attacher, deferred): - self.attacher = attacher - self.d = deferred - - def __call__(self, circuit): - """ - Return from build_circuit is a Circuit, however, we want to - wait until it is built before we can issue an attach on it and - callback to the Deferred we issue here. - """ - log.msg("Circuit %s is in progress ..." % circuit.id) - self.attacher.waiting_circuits.append((circuit.id, self.d)) - - return self.state.build_circuit(path).addCallback(AppendWaiting(self, deferred_to_callback)).addErrback(log.err) - class BridgetAsset(Asset): """ Class for parsing bridge assets so that they can be commented out. @@ -214,18 +122,25 @@ class BridgetTest(OONITest): self.data_directory = None if self.local_options: - try: - from ooni.lib.txtorcon import TorConfig - except: - e = "Could not import TorConfig class from txtorcon!" - raise ImportError, e - - options = self.local_options - self.config = TorConfig() + options = self.local_options - ## Don't run the experiment if we don't have anything to test if not options['bridges'] and not options['relays']: self.suicide = True + return + + try: + from ooni.lib.txtorcon import TorConfig + except ImportError: + log.msg ("Bridget: Unable to import from ooni.lib.txtorcon") + wd, tx = getcwd(), 'lib/txtorcon/torconfig.py' + chk = pj(wd,tx) if wd.endswith('ooni') else pj(wd,'ooni/'+tx) + try: + assert isfile(chk) + except: + log.msg("Error: Some OONI libraries are missing!") + log.msg("Please go to /ooni/lib/ and do \"make all\"") + + self.config = TorConfig() if options['bridges']: self.config.UseBridges = 1 @@ -284,26 +199,23 @@ class BridgetTest(OONITest): ## we should probably find a more memory nice way to load addresses, ## in case the files are really large if self.local_options: - if self.local_options['bridges']: - log.msg("Loading bridge information from %s ..." - % self.local_options['bridges']) - with open(self.local_options['bridges']) as bridge_file: - for line in bridge_file.readlines(): + @staticmethod + def make_asset_list(opt, lst): + log.msg("Loading information from %s ..." % opt) + with open(opt) as opt_file: + for line in opt_file.readline(): if line.startswith('#'): continue else: - self.bridge_list.append(line.replace('\n','')) - assets.update({'bridges': self.bridge_list}) + lst.append(line.replace('\n','')) + if self.local_options['bridges']: + make_asset_list(self.local_options['bridges'], + self.bridge_list) + assets.update({'bridges': self.bridge_list}) if self.local_options['relays']: - log.msg("Loading relay information from %s ..." - % self.local_options['relays']) - with open(options['relays']) as relay_file: - for line in relay_file.readlines(): - if line.startswith('#'): - continue - else: - self.relay_list.append(line.replace('\n','')) + make_asset_list(self.local_options['relays'], + self.relay_list) assets.update({'relays': self.relay_list}) return assets @@ -321,8 +233,20 @@ class BridgetTest(OONITest): this has a :class:`ooni.lib.txtorcon.torcontol.TorControlProtocol <TorControlProtocol>` instance as .protocol. """ - from ooni.lib.txtorcon import TorProtocolFactory, TorConfig, TorState - from ooni.lib.txtorcon import DEFAULT_VALUE, launch_tor + try: + from ooni.lib.txtorcon import CircuitListenerMixin, IStreamAttacher + from ooni.lib.txtorcon import TorProtocolFactory, TorConfig, TorState + from ooni.lib.txtorcon import DEFAULT_VALUE, launch_tor + except ImportError: + log.msg("Error: Unable to import from ooni.lib.txtorcon") + wd, tx = getcwd(), 'lib/txtorcon/torconfig.py' + chk = pj(wd,tx) if wd.endswith('ooni') else pj(wd,'ooni/'+tx) + try: + assert isfile(chk) + except: + log.msg("Error: Some OONI libraries are missing!") + log.msg(" Please go to /ooni/lib/ and do \"make all\"") + return sys.exit() def bootstrap(ctrl): """ @@ -365,12 +289,102 @@ class BridgetTest(OONITest): log.msg("%d%%: %s" % (prog, summary)) if len(args) == 0: - log.msg("Bridget needs lists of bridges and/or relays to test!") + log.msg("Bridget can't run without bridges or relays to test!") log.msg("Exiting ...") - d = sys.exit() - return d - + return sys.exit() else: + + class CustomCircuit(CircuitListenerMixin): + implements(IStreamAttacher) + + from txtorcon.interface import IRouterContainer + from txtorcon.interface import ICircuitContainer + + def __init__(self, state): + self.state = state + self.waiting_circuits = [] + + def waiting_on(self, circuit): + for (circid, d) in self.waiting_circuits: + if circuit.id == circid: + return true + return False + + def circuit_extend(self, circuit, router): + "ICircuitListener" + if circuit.purpose != 'GENERAL': + return + if self.waiting_on(circuit): + log.msg("Circuit %d (%s)" + % (circuit.id, router.id_hex)) + + def circuit_built(self, circuit): + "ICircuitListener" + if circuit.purpose != 'GENERAL': + return + log.msg("Circuit %s built ..." % circuit.id) + log.msg("Full path of %s: %s" % (circuit.id, circuit.path)) + for (circid, d) in self.waiting_circuits: + if circid == circuit.id: + self.waiting_circuits.remove(circid, d) + d.callback(circuit) + + def circuit_failed(self, circuit, reason): + if self.waiting_on(circuit): + log.msg("A circuit we requested %s failed for reason %s" + % (circuit.id, reason)) + circid, d = None, None + for x in self.waiting_circuits: + if x[0] == circuit.id: + circid, d, stream_cc = x + if d is None: + raise Exception("Expected to find circuit.") + + self.waiting_circuits.remove((circid, d)) + log.msg("Trying to build a circuit for %s" % circid) + self.request_circuit_build(d) + + def check_circuit_route(self, circuit, router): + if router in circuit.path: + #router.update() ## XXX can i use without args? no. + TorInfo.dump(self) + + def request_circuit_build(self, deferred): + entries = self.state.entry_guards.value() + relays = self.state.routers.values() + log.msg("We have these nodes listed as entry guards:") + log.msg("%s" % entries) + log.msg("We have these nodes listed as relays:") + log.msg("%s" % relays) + path = [random.choice(entries), + random.choice(relays), + random.choice(relays)] + log.msg("Requesting a circuit: %s" + % '-->'.join(map(lambda x: x.location.countrycode, + path))) + + class AppendWaiting: + def __init__(self, attacher, deferred): + self.attacher = attacher + self.d = deferred + + def __call__(self, circuit): + """ + Return from build_circuit is a Circuit, however, + we want to wait until it is built before we can + issue an attach on it and callback to the Deferred + we issue here. + """ + log.msg("Circuit %s is in progress ..." % circuit.id) + self.attacher.waiting_circuits.append((circuit.id, + self.d)) + + fin = self.state.build_circuit(path) + fin.addCallback(AppendWaiting(self, deferred_to_callback)) + fin.addErrback(log.err) + return fin + + if len(self.bridge_list) >= 1: for bridge in self.bridge_list: try:

1 0

[ooni-probe/master] * Fixed the help menu in bridget because the portCheck type enforcement
by isis＠torproject.org 15 Sep '12

15 Sep '12

commit ec583eab1515aa545f371f255fffff2f84c4bbb7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 15 05:23:01 2012 +0000 * Fixed the help menu in bridget because the portCheck type enforcement function wasn't working. * Added documentation at /docs/bridget.md on using bridget. --- docs/bridget.md | 102 +++++++++++++++++++++++++++++++++++++++++++++++ ooni/plugins/bridget.py | 47 +++++++++++----------- 2 files changed, 126 insertions(+), 23 deletions(-) diff --git a/docs/bridget.md b/docs/bridget.md new file mode 100644 index 0000000..05ba65b --- /dev/null +++ b/docs/bridget.md @@ -0,0 +1,102 @@ += ooniprobe Bridget Plugin = + +== Who's that? == + +Bridget is an OONI plugin for testing the reachability of bridges and relays +in the Tor network. + +== Dependencies == + +In addition to the regular OONI dependencies, bridget requires +[https://github.com/meejah/txtorcon.git txtorcon]. If you don't already have +it installed on your system, there is a Makefile in ooni/lib/ which will git +clone it for you, and copy the API portions to ooni/lib/ and discard the +rest. If you're seeing errors saying "Bridget requires txtorcon!" or "Unable +to import libraries from txtorcon!", then you should use the Makefile by +doing: + + $ cd ooni/lib/ && make txtorcon + +== Using Bridget == + +=== Defaults === + +'''Tor Binary Path''' +By default, Bridget will start a new Tor process from the binary at +/usr/sbin/tor. If you have a different Tor binary that you'd like to use, +you can tell Bridget where it is by using the '--torpath' option. + +'''Tor SocksPort and ControlPort''' +Also, Bridget is configured to start Tor with ControlPort=9052 and +SocksPort=9049. If you're running a firewall, you should make sure that +localhost is allowed incoming access to those ports. To use different ports, +see the '--socks' and '--control' options. + +If you're a true Entropist, you can use the '--random' option to randomize +which ports are used for the SocksPort and ControlPort. + +=== Running Tests === + +You'll need some assets first. + +OONI assets are simple text files describing what it is that you want +tested. Normally, one thing-to-be-tested per line, sometimes with comma +separated values. The test you're using should tell you what it wants (if it +doesn't, you should complain to one of the OONI developers). Normally, assets +look like this: + + [file:assets/things.txt] + torproject.org + ooni.nu + eff.org + riseup.net + [...] + +==== Testing Relays with Bridget ==== + +This doesn't work all the way yet. Eventually, you'll need to give bridget +an asset with one relay IP address per line, like this: + + [file:assets/relays.txt] + 123.123.123.123 + 11.22.33.44 + 111.1.111.1 + [...] + +and you'll use it by doing: + + path-to-ooni-probe/ooni/$ ./ooniprobe.py bridget -f assets/relays.txt + +Once the relays feature is functional, it will be possible to test bridges and +relays at the same time: Bridget will try to connect to a bridge, and, if that +worked, it will try to build a circuit from the provided relays, noting which +bridges/relays fail and which ones succeed. This will continue until all the +bridges and relays have been tested. + +==== Testing Bridges with Bridget ==== + +Bridget will need an asset file with bridge IPs and ORPorts, one per +line. Your asset file should look like this: + + [file:assets/bridges.txt] + 11.22.33.44:443 + 2.3.5.7:9001 + 222.111.0.111:443 + [...] + +and you'll call Bridget like this: + + path-to-ooni-probe/ooni/$ ./ooniprobe.py bridget -b assets/bridges.txt + +==== Testing Bridge Pluggable Transports ==== + +Bridget can test whether a bridge with a pluggable transport, like obfsproxy, +is reachable. To reach these bridges, you need to have the pluggable transport +that you want to test installed. You should look at the documentation for that +transport to figure out how to do that. + +To test a pluggable transport, do this (the quotemarks are important): + + $ ./ooniprobe.py bridget -t "/path/to/PT/binary [options]" \ + -b assets/bridges.txt + diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index be39371..745815f 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -29,47 +29,48 @@ from ooni.plugoo.tests import ITest, OONITest from ooni.plugoo.assets import Asset -class BridgetArgs(usage.Options): - def portCheck(number): - number = int(number) - if number not in range(1024, 65535): - raise ValueError("Port out of range") +def portCheck(number): + number = int(number) + if number not in range(1024, 65535): + raise ValueError("Port out of range") + +portCheckAllowed = "must be between 1024 and 65535." +sockCheck, ctrlCheck = portCheck, portCheck +sockCheck.coerceDoc = "Port to use for Tor's SocksPort, " + portCheckAllowed +ctrlCheck.coerceDoc = "Port to use for Tor's ControlPort, " + portCheckAllowed - portCheck.coerceDoc = "Ports must be between 1024 and 65535" +class BridgetArgs(usage.Options): optParameters = [ ['bridges', 'b', None, - 'List of bridges to scan <IP>:<ORport>'], + 'File listing bridge IP:ORPorts to test'], ['relays', 'f', None, - 'List of relays to scan <IP>'], - ['socks', 's', 9049, portCheck, - 'Tor SocksPort to use'], - ['control', 'c', 9052, portCheck, - 'Tor ControlPort to use'], - ['tor-path', 'p', None, + 'File listing relay IPs to test'], + ['socks', 's', 9049, None, portCheck], + ['control', 'c', 9052, None, portCheck], + ['torpath', 'p', None, 'Path to the Tor binary to use'], - ['data-dir', 'd', None, + ['datadir', 'd', None, 'Tor DataDirectory to use'], ['transport', 't', None, 'Tor ClientTransportPlugin'], ['resume', 'r', 0, 'Resume at this index']] - optFlags = [['random', 'x', 'Randomize control and socks ports']] + optFlags = [ + ['random', 'x', 'Use random ControlPort and SocksPort']] def postOptions(self): - ## We can't test pluggable transports without bridges if self['transport'] and not self['bridges']: e = "Pluggable transport requires the bridges option" raise usage.UsageError, e - ## We can't use random and static port simultaneously if self['socks'] and self['control']: if self['random']: e = "Unable to use random and specific ports simultaneously" - raise usageError, e + raise usage.usageError, e class BridgetAsset(Asset): """ - Class for parsing bridge assets so that they can be commented out. + Class for parsing bridget Assets ignoring commented out lines. """ def __init__(self, file=None): self = Asset.__init__(self, file) @@ -163,11 +164,11 @@ class BridgetTest(OONITest): self.socks_port = random.randint(1024, 2**16) self.control_port = random.randint(1024, 2**16) - if options['tor-path']: - self.tor_binary = options['tor-path'] + if options['torpath']: + self.tor_binary = options['torpath'] - if options['data-dir']: - self.config.DataDirectory = options['data-dir'] + if options['datadir']: + self.config.DataDirectory = options['datadir'] if options['transport']: ## ClientTransportPlugin transport socks4|socks5 IP:PORT

1 0

[flashproxy/master] Don't disable for Safari 6.0 and later.
by dcf＠torproject.org 15 Sep '12

15 Sep '12

commit 03d253168bb6fce49bcbd0dc77b5fe930dece8b7 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 14 22:01:09 2012 -0700 Don't disable for Safari 6.0 and later. Safari 6 now has the newer hybi/RFC 6455 type of WebSocket. I just tested and was able to bootstrap through Safari for the first time. I did not find a nice in-browser way to test for the websocket type, short of User-Agent sniffing. --- flashproxy.js | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 32eb534..cd31f60 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -843,10 +843,11 @@ function flashproxy_should_disable() { } } - if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i)) { - /* Disable on Safari because it doesn't have the hybi/RFC type of - WebSockets. */ - puts("Disable because User-Agent is Safari."); + if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i) + && !ua.match(/\bversion\/[6789]\./i)) { + /* Disable before Safari 6.0 because it doesn't have the hybi/RFC type + of WebSockets. */ + puts("Disable because User-Agent is Safari before 6.0."); return true; }

1 0

r25795: {website} add some experimental support options. (website/trunk/about/en)
by Andrew Lewman 15 Sep '12

15 Sep '12

Author: phobos Date: 2012-09-15 02:46:34 +0000 (Sat, 15 Sep 2012) New Revision: 25795 Modified: website/trunk/about/en/contact.wml Log: add some experimental support options. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-09-14 15:13:03 UTC (rev 25794) +++ website/trunk/about/en/contact.wml 2012-09-15 02:46:34 UTC (rev 25795) @@ -17,6 +17,7 @@ <li><a href="#identica">Identi.ca</a></li> <li><a href="#irc">IRC</a></li> <li><a href="#livechat">Live Chat</a></li> + <li><a href="#sms">SMS/Text Messaging</a></li> <li><a href="#phone">Telephone</a></li> </ul> @@ -84,12 +85,21 @@ href="http://www.cypherpunks.ca/otr/">Off-the-Record</a> Messenging.</p> + <a id="sms"></a> + <h3><a class="anchor" href="#sms">SMS/Text Messaging</a></h3> + <p>We've started an experimental SMS/Text Messaging contact + system. The following number can receive SMS/Text Messages from + anywhere: +15088010746. Please be aware that your phone company and + ours (and everyone in between) could see the messages.</p> + <a id="phone"></a> <h3><a class="anchor" href="#phone">Telephone</a></h3> <p>If none of the above appeal to you, calling +1-781-948-1982 - will reach the Tor office. Should there be no answer, please leave - a message with a way to reach you. Please email - <i>help(a)rt.torproject.org</i> for technical support.</p> + will reach the Tor office. Should there be no answer, please leave + a message with a way to reach you. Please be aware that your phone + company and ours (and everyone in between) could listen to the + call. Please email <i>help(a)rt.torproject.org</i> for technical + support.</p> </div>

1 0

[ooni-probe/master] Merge branch 'bridget-twisted'
by isis＠torproject.org 15 Sep '12

15 Sep '12

commit 963cad2a4610be403a2592f5d2fa7b4aca05062b Merge: cf5e13c 3d87617 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 15 01:12:13 2012 +0000 Merge branch 'bridget-twisted' ooni/plugins/bridget.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)

1 0

[ooni-probe/master] Updated documentation in ooni/plugins/bridget.py.
by isis＠torproject.org 15 Sep '12

15 Sep '12

commit 3d87617306002854b69f8de1b2ff2702d671a0f2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Sep 14 00:14:58 2012 +0000 Updated documentation in ooni/plugins/bridget.py. --- ooni/plugins/bridget.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index a53630c..95f7453 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -406,16 +406,15 @@ bridget = BridgetTest(None, None, None) ## ----------- ## self.config.save() only needs to be called if Tor is already running. ## -## need to add transport type to torrc Bridge line: -## Bridge <transport> IP:ORPort <fingerprint> -## ## TODO: ## o add option for any kwarg=arg self.config setting ## o cleanup documentation +## x add DataDirectory option ## o check if bridges are public relays ## o take bridge_desc file as input, also be able to give same ## format as output -## o change the stupid name ## ## FIX: -## data directory is not found, or permissions aren't right +## o DataDirectory is not found, or permissions aren't right +## o Bridge line needs generation of transport properties +## Bridge <transport> IP:ORPort <fingerprint>

1 0

[torbrowser/maint-2.2] update recommended-versions
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit f9cf082d092ad420c2da5a3814d9cb39d1898c8b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:02 2012 +0100 update recommended-versions --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ba836de..846caf9 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.38-2-MacOS-i386", -"2.2.38-2-MacOS-x86_64", -"2.2.38-2-Windows", -"2.2.38-2-Linux-i686", -"2.2.38-2-Linux-x86_64", -"2.3.20-alpha-1-MacOS-i386", -"2.3.20-alpha-1-Windows", -"2.3.20-alpha-1-Linux-i386", -"2.3.20-alpha-1-Linux-x86_64" +"2.2.39-1-MacOS-i386", +"2.2.39-1-MacOS-x86_64", +"2.2.39-1-Windows", +"2.2.39-1-Linux-i686", +"2.2.39-1-Linux-x86_64", +"2.3.22-alpha-1-MacOS-i386", +"2.3.22-alpha-1-Windows", +"2.3.22-alpha-1-Linux-i386", +"2.3.22-alpha-1-Linux-x86_64" ]

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit 19d3c1fbf8650887e99b6b5cbceb9365dafb8571 Merge: b954810 f9cf082 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:14 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

[torbrowser/master] update recommended-versions
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit f9cf082d092ad420c2da5a3814d9cb39d1898c8b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:02 2012 +0100 update recommended-versions --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ba836de..846caf9 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.38-2-MacOS-i386", -"2.2.38-2-MacOS-x86_64", -"2.2.38-2-Windows", -"2.2.38-2-Linux-i686", -"2.2.38-2-Linux-x86_64", -"2.3.20-alpha-1-MacOS-i386", -"2.3.20-alpha-1-Windows", -"2.3.20-alpha-1-Linux-i386", -"2.3.20-alpha-1-Linux-x86_64" +"2.2.39-1-MacOS-i386", +"2.2.39-1-MacOS-x86_64", +"2.2.39-1-Windows", +"2.2.39-1-Linux-i686", +"2.2.39-1-Linux-x86_64", +"2.3.22-alpha-1-MacOS-i386", +"2.3.22-alpha-1-Windows", +"2.3.22-alpha-1-Linux-i386", +"2.3.22-alpha-1-Linux-x86_64" ]

1 0