- tor-commits - lists.torproject.org

[ooni-probe/master] s/config.tor.socksport/config.tor.socks_port/
by art＠torproject.org 27 Nov '12

27 Nov '12

commit cd54568df42e35aad2563c1c87f0a36097228ca5 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Nov 27 03:29:42 2012 +0100 s/config.tor.socksport/config.tor.socks_port/ --- ooni/reporter.py | 2 +- ooni/templates/httpt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index dac9aba..8e4eede 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -259,7 +259,7 @@ class OONIBReporter(OReporter): from twisted.internet import reactor try: self.agent = Agent(reactor, sockshost="127.0.0.1", - socksport=int(config.advanced.tor_socksport)) + socksport=int(config.tor.socks_port)) except Exception, e: log.exception(e) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index b8bd9a7..e3c8efe 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -64,7 +64,7 @@ class HTTPTest(NetTestCase): "not work") self.control_agent = Agent(reactor, sockshost="127.0.0.1", - socksport=config.advanced.tor_socksport) + socksport=config.tor.socks_port) self.report['socksproxy'] = None sockshost, socksport = (None, None)

1 0

[ooni-probe/master] If the option start_tor is set to True, make sure that Tor is started before running the test deck
by art＠torproject.org 27 Nov '12

27 Nov '12

commit 12c12cee5224dc1f62ae7cfc77cd4e0c6e2283e9 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Nov 27 03:08:15 2012 +0100 If the option start_tor is set to True, make sure that Tor is started before running the test deck --- ooni/oonicli.py | 64 +++++++++++++++++++++++++++++++++++++++++++------------ ooni/runner.py | 61 +++++++++++++++++++--------------------------------- ooniprobe.conf | 4 +- 3 files changed, 74 insertions(+), 55 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 2b0991b..26cfdab 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -96,22 +96,26 @@ def testsEnded(*arg, **kw): try: reactor.stop() except: pass -def run(): - """ - Call me to begin testing from a file. - """ - cmd_line_options = Options() - if len(sys.argv) == 1: - cmd_line_options.getUsage() +def startSniffing(): + from ooni.utils.txscapy import ScapyFactory, ScapySniffer try: - cmd_line_options.parseOptions() - except usage.UsageError, ue: - raise SystemExit, "%s: %s" % (sys.argv[0], ue) + checkForRoot() + except NotRootError: + print "[!] Includepcap options requires root priviledges to run" + print " you should run ooniprobe as root or disable the options in ooniprobe.conf" + sys.exit(1) + + print "Starting sniffer" + config.scapyFactory = ScapyFactory(config.advanced.interface) + + sniffer = ScapySniffer(config.reports.pcap) + config.scapyFactory.registerProtocol(sniffer) + +def runTestDeckOrTest(result, cmd_line_options): deck_dl = [] resume = cmd_line_options['resume'] - log.start(cmd_line_options['logfile']) if cmd_line_options['testdeck']: test_deck = yaml.safe_load(open(cmd_line_options['testdeck'])) for test in test_deck: @@ -135,7 +139,39 @@ def run(): # Print every 5 second the list of current tests running l = task.LoopingCall(updateStatusBar) l.start(5.0) + return d2 + +def errorRunningTests(failure): + failure.printTraceback() + +def run(): + """ + Call me to begin testing from a file. + """ + + cmd_line_options = Options() + if len(sys.argv) == 1: + cmd_line_options.getUsage() + try: + cmd_line_options.parseOptions() + except usage.UsageError, ue: + raise SystemExit, "%s: %s" % (sys.argv[0], ue) + + log.start(cmd_line_options['logfile']) + + if config.privacy.includepcap: + log.msg("Starting") + runner.startSniffing() + + if config.advanced.start_tor: + log.msg("Starting Tor...") + d = runner.startTor() + d.addCallback(runTestDeckOrTest, cmd_line_options) + d.addErrback(errorRunningTests) + else: + # We need to pass None as first argument because when the callback + # is fired it will pass it's result to runTestCase. + d = runTestDeckOrTest(None, cmd_line_options) + d.addErrback(errorRunningTests) - if config.start_reactor: - log.debug("Starting reactor") - reactor.run() + reactor.run() diff --git a/ooni/runner.py b/ooni/runner.py index 6940ec6..30682e9 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -433,7 +433,6 @@ class UnableToStartTor(Exception): pass def startTor(): - @defer.inlineCallbacks def state_complete(state): config.tor_state = state @@ -444,9 +443,9 @@ def startTor(): config.tor.socks_port = yield state.protocol.get_conf("SocksPort") config.tor.control_port = yield state.protocol.get_conf("ControlPort") - def setup_failed(arg): - log.exception(arg) - raise UnableTorStartTor + def setup_failed(failure): + log.exception(failure) + raise UnableToStartTor def setup_complete(proto): """ @@ -459,7 +458,7 @@ def startTor(): return state.post_bootstrap def updates(prog, tag, summary): - log.msg("%d%%: %s" % (prog, summary)) + print "%d%%: %s" % (prog, summary) tor_config = TorConfig() if config.tor.control_port: @@ -481,11 +480,27 @@ def startTor(): log.debug("Setting control port as %s" % tor_config.ControlPort) log.debug("Setting SOCKS port as %s" % tor_config.SocksPort) - d = launch_tor(tor_config, reactor, progress_updates=updates) + d = launch_tor(tor_config, reactor, + progress_updates=updates) d.addCallback(setup_complete) d.addErrback(setup_failed) return d +def startSniffing(): + from ooni.utils.txscapy import ScapyFactory, ScapySniffer + try: + checkForRoot() + except NotRootError: + print "[!] Includepcap options requires root priviledges to run" + print " you should run ooniprobe as root or disable the options in ooniprobe.conf" + sys.exit(1) + + print "Starting sniffer" + config.scapyFactory = ScapyFactory(config.advanced.interface) + + sniffer = ScapySniffer(config.reports.pcap) + config.scapyFactory.registerProtocol(sniffer) + def runTest(cmd_line_options): config.cmd_line_options = cmd_line_options config.generateReportFilenames() @@ -502,36 +517,4 @@ def runTest(cmd_line_options): classes = findTestClassesFromFile(cmd_line_options['test']) test_cases, options = loadTestsAndOptions(classes, cmd_line_options) - if config.privacy.includepcap: - from ooni.utils.txscapy import ScapyFactory, ScapySniffer - try: - checkForRoot() - except NotRootError: - print "[!] Includepcap options requires root priviledges to run" - print " you should run ooniprobe as root or disable the options in ooniprobe.conf" - sys.exit(1) - - print "Starting sniffer" - config.scapyFactory = ScapyFactory(config.advanced.interface) - - sniffer = ScapySniffer(config.reports.pcap) - config.scapyFactory.registerProtocol(sniffer) - - # If we should start Tor then start it. Once Tor has started we will make - # sure. If not we assume that it is already running - if config.advanced.start_tor: - def tor_startup_failed(failure): - log.err(failure) - - def tor_started(): - return runTestCases(test_cases, - options, cmd_line_options) - - d = startTor() - d.addCallback(tor_started) - d.addErrback(tor_startup_failed) - return d - - else: - return runTestCases(test_cases, - options, cmd_line_options) + return runTestCases(test_cases, options, cmd_line_options) diff --git a/ooniprobe.conf b/ooniprobe.conf index b553a37..ed77dfe 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -22,13 +22,13 @@ advanced: # /path/to/ooni-probe/data/ geoip_data_dir: /usr/share/GeoIP/ debug: true - threadpool_size: 10 - tor_binary: '/usr/sbin/tor' # For auto detection interface: auto # Of specify a specific interface #interface: wlan0 + # If you do not specify start_tor, you will have to have Tor running and + # explicitly set the control port and orport. start_tor: true tor: #socks_port: 9050

1 0

[metrics-tasks/master] Typos (#1854).
by karsten＠torproject.org 27 Nov '12

27 Nov '12

commit 837ce3a5a5f0336ea051aebc697f324c75f580f5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 26 20:45:20 2012 -0500 Typos (#1854). --- task-1854/plot-entropy.R | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/task-1854/plot-entropy.R b/task-1854/plot-entropy.R index d62657e..5d30583 100644 --- a/task-1854/plot-entropy.R +++ b/task-1854/plot-entropy.R @@ -11,14 +11,14 @@ c <- data.frame(x = p$advbw, y = p$cumprob, ggplot(c, aes(x = x, y = y, colour = colour)) + geom_line() + scale_x_log10(name = "\nAdvertised bandwidth in B/s (log scale)") + -scale_y_continuous(name = "Cumulated probability\n") + +scale_y_continuous(name = "Cumulative probability\n") + scale_colour_hue(name = "Adv. bw. cutoff in B/s") + opts(legend.position = "top") ggplot(c, aes(x = x, y = y, colour = colour)) + geom_line() + scale_x_log10(name = "\nAdvertised bandwidth in B/s (log scale)") + -scale_y_log10(name = "Cumulated probability (log scale)\n") + +scale_y_log10(name = "Cumulative probability (log scale)\n") + scale_colour_hue(name = "Adv. bw. cutoff in B/s") + opts(legend.position = "top")

1 0

[metrics-tasks/master] Add probability graphs (#1854).
by karsten＠torproject.org 27 Nov '12

27 Nov '12

commit ad05f28662ddb22c44c88111315ae5b3f2ae7f66 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 26 20:41:29 2012 -0500 Add probability graphs (#1854). --- task-1854/plot-entropy.R | 22 ++++++++++++++- task-1854/pyextract.py | 10 +++++- task-1854/pylinf.py | 66 +++++++++++++++++++++++++++++++++------------ 3 files changed, 77 insertions(+), 21 deletions(-) diff --git a/task-1854/plot-entropy.R b/task-1854/plot-entropy.R index 95b8b18..d62657e 100644 --- a/task-1854/plot-entropy.R +++ b/task-1854/plot-entropy.R @@ -2,7 +2,27 @@ library(ggplot2) library(reshape) library(scales) -e <- read.csv("extracted.csv", header = FALSE, +p <- read.csv("prob-extracted.csv", header = FALSE, + col.names = c("validafter", "minadvbw", "advbw", "cumprob"), + stringsAsFactor = FALSE) +p <- p[p$minadvbw >= 20480, ] +c <- data.frame(x = p$advbw, y = p$cumprob, + colour = as.factor(p$minadvbw)) +ggplot(c, aes(x = x, y = y, colour = colour)) + +geom_line() + +scale_x_log10(name = "\nAdvertised bandwidth in B/s (log scale)") + +scale_y_continuous(name = "Cumulated probability\n") + +scale_colour_hue(name = "Adv. bw. cutoff in B/s") + +opts(legend.position = "top") + +ggplot(c, aes(x = x, y = y, colour = colour)) + +geom_line() + +scale_x_log10(name = "\nAdvertised bandwidth in B/s (log scale)") + +scale_y_log10(name = "Cumulated probability (log scale)\n") + +scale_colour_hue(name = "Adv. bw. cutoff in B/s") + +opts(legend.position = "top") + +e <- read.csv("linf-extracted.csv", header = FALSE, col.names = c("validafter", "min_adv_bw", "relays", "linf", "excl_adv_bw", "graph"), stringsAsFactor = FALSE) diff --git a/task-1854/pyextract.py b/task-1854/pyextract.py index 33614e2..bd11ea4 100644 --- a/task-1854/pyextract.py +++ b/task-1854/pyextract.py @@ -2,11 +2,11 @@ import os import sys def main(): - out_file = open('extracted.csv', 'w') + out_file = open('linf-extracted.csv', 'w') prev_validafter, max_validafter = '', '' max_lines = [] prev_relays, prev_min_adv_bw = 0, 0 - for line in open('entropy.csv'): + for line in open('linf.csv'): parts = line.strip().split(',') validafter = parts[0] min_adv_bw = int(parts[1]) @@ -32,6 +32,12 @@ def main(): prev_min_adv_bw = min_adv_bw for line in max_lines: out_file.write(line + ",last\n") + out_file.close() + prob_out_file = open('prob-extracted.csv', 'w') + for line in open('prob.csv'): + if line.startswith(max_validafter): + prob_out_file.write(line.strip() + '\n') + prob_out_file.close() if __name__ == '__main__': main() diff --git a/task-1854/pylinf.py b/task-1854/pylinf.py index 88cc773..3bdd8a2 100644 --- a/task-1854/pylinf.py +++ b/task-1854/pylinf.py @@ -102,9 +102,12 @@ def load_server_desc(tar_file_path): tar_fh.close() def run(data): + """ Return tuple of two strings, one string containing linf values for + all possible advertised bandwidth cutoffs, and one containing + probability distributions for predefined cutoffs. """ routers = [] router = None - result_string = [] + linf_string, prob_string = [], [] Wed, Wee, Wgd, Wgg = 1, 1, 1, 1 # parse consensus @@ -151,6 +154,8 @@ def run(data): omitted_routers = 0 min_adv_bw = routers[0].advertised_bw + cutoffs = [10240, 20480, 51200, 102400, 204800, 512000, 1048576] + while(omitted_routers<len(routers)): total_bw = 0 @@ -170,11 +175,29 @@ def run(data): diff = abs(new_prob - router.prob) prob_diff.append(diff) - result_string.append(','.join([valid_after, + linf_string.append(','.join([valid_after, str(min_adv_bw), str(len(routers)-omitted_routers), str(max(prob_diff))])) + while len(cutoffs) > 0 and min_adv_bw > cutoffs[0]: + cumulated_prob = 0.0 + prev_advertised_bw = 0 + for router in routers: + if router.advertised_bw > cutoffs[0] and \ + prev_advertised_bw != router.advertised_bw: + prob_string.append(','.join([valid_after, + str(cutoffs[0]), + str(prev_advertised_bw), + str(cumulated_prob)])) + prev_advertised_bw = router.advertised_bw + cumulated_prob += float(router.bandwidth)/float(total_bw) + prob_string.append(','.join([valid_after, + str(cutoffs[0]), + str(prev_advertised_bw), + str(cumulated_prob)])) + cutoffs.pop(0) + # remove routers with min adv_bw for router in routers: if router.advertised_bw == min_adv_bw: @@ -184,7 +207,7 @@ def run(data): min_adv_bw = router.advertised_bw break - return '\n'.join(result_string) + return ('\n'.join(linf_string), '\n'.join(prob_string)) def parse_args(): usage = "Usage - python pyentropy.py [options]" @@ -196,8 +219,10 @@ def parse_args(): help="Input AS GeoIP database") parser.add_option("-s", "--server_desc", dest="server_desc", default=False, help="Server descriptors directory") - parser.add_option("-o", "--output", dest="output", default="entropy.csv", - help="Output filename") + parser.add_option("-l", "--linf-output", dest="linf", default="linf.csv", + help="linf output filename") + parser.add_option("-r", "--prob-output", dest="prob", default="prob.csv", + help="Probabilities output filename") parser.add_option("-c", "--consensus", dest="consensus", default="in/consensus", help="Input consensus dir") parser.add_option("-p", "--pickled_data", dest="pickled_data", default=False, @@ -227,16 +252,21 @@ if __name__ == "__main__": with open('data.pkl', 'wb') as output: pickle.dump(descriptors, output) - with open(options.output, 'w') as out_fh: - for file_name in os.listdir(options.consensus): - file_path = os.path.join(options.consensus, file_name) - tar_fh = tarfile.open(file_path) - for member in tar_fh: - if not member.isfile(): - continue - tar_file_data=tar_fh.extractfile(member) - data=tar_file_data.read() - output_string = run(data) - if output_string: - out_fh.write("%s\n" % (output_string)) - tar_fh.close() + linf_fh = open(options.linf, 'w') + prob_fh = open(options.prob, 'w') + for file_name in os.listdir(options.consensus): + file_path = os.path.join(options.consensus, file_name) + tar_fh = tarfile.open(file_path) + for member in tar_fh: + if not member.isfile(): + continue + tar_file_data=tar_fh.extractfile(member) + data=tar_file_data.read() + (linf_string, prob_string) = run(data) + if linf_string: + linf_fh.write("%s\n" % (linf_string)) + if prob_string: + prob_fh.write("%s\n" % (prob_string)) + tar_fh.close() + linf_fh.close() + prob_fh.close()

1 0

[ooni-probe/master] Add support for starting Tor via txtorcon
by art＠torproject.org 26 Nov '12

26 Nov '12

commit a65b6ebb7e90a4350b1a214189196d11a8371eda Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 26 22:49:14 2012 +0100 Add support for starting Tor via txtorcon * XXX would like to be able to know if Tor is censored and add it to the report, this can easily be done if running launch_tor with a timeout. This is provided by this patch: https://github.com/meejah/txtorcon/pull/24 --- ooni/config.py | 10 ++++- ooni/runner.py | 97 +++++++++++++++++++++++++++++++++++++++++++++++++---- ooni/utils/net.py | 26 ++++++++++++++ ooniprobe.conf | 9 ++++- 4 files changed, 132 insertions(+), 10 deletions(-) diff --git a/ooni/config.py b/ooni/config.py index 69842b6..edfb196 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -65,7 +65,13 @@ def loadConfigFile(): advanced = Storage() for k, v in configuration['advanced'].items(): advanced[k] = v - return basic, privacy, advanced + + # Process the tor configuration options + tor = Storage() + for k, v in configuration['tor'].items(): + tor[k] = v + + return basic, privacy, advanced, tor class TestFilenameNotSet(Exception): pass @@ -85,7 +91,7 @@ def generateReportFilenames(): if not basic: # Here we make sure that we instance the config file attributes only once - basic, privacy, advanced = loadConfigFile() + basic, privacy, advanced, tor = loadConfigFile() if not resume_filename: resume_filename = os.path.join(get_root_path(), 'ooniprobe.resume') diff --git a/ooni/runner.py b/ooni/runner.py index 6ea4a86..6940ec6 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -21,12 +21,20 @@ from twisted.internet import defer from twisted.trial.runner import filenameToModule from twisted.internet import reactor, threads +from txtorcon import TorProtocolFactory, TorConfig +from txtorcon import TorState, launch_tor + +from ooni import config + +from ooni.reporter import OONIBReporter, YAMLReporter +from ooni.reporter import OONIBReportCreationFailed + from ooni.inputunit import InputUnitFactory from ooni.nettest import NetTestCase, NoPostProcessor -from ooni import reporter, config - -from ooni.utils import log, checkForRoot, NotRootError, Storage +from ooni.utils import log, checkForRoot +from ooni.utils import NotRootError, Storage +from ooni.utils.net import randomFreePort def processTest(obj): """ @@ -374,10 +382,10 @@ def runTestCases(test_cases, options, cmd_line_options): if cmd_line_options['collector']: log.msg("Using remote collector, please be patient while we create the report.") - oreporter = reporter.OONIBReporter(cmd_line_options) + oreporter = OONIBReporter(cmd_line_options) else: log.msg("Reporting to file %s" % config.reports.yamloo) - oreporter = reporter.YAMLReporter(cmd_line_options) + oreporter = YAMLReporter(cmd_line_options) try: input_unit_factory = InputUnitFactory(test_inputs) @@ -386,7 +394,7 @@ def runTestCases(test_cases, options, cmd_line_options): try: yield oreporter.createReport(options) - except reporter.OONIBReportCreationFailed: + except OONIBReportCreationFailed: log.err("Error in creating new report") raise except Exception, e: @@ -421,6 +429,63 @@ def runTestCases(test_cases, options, cmd_line_options): except Exception: log.exception("Problem in running test") +class UnableToStartTor(Exception): + pass + +def startTor(): + + @defer.inlineCallbacks + def state_complete(state): + config.tor_state = state + log.msg("Successfully bootstrapped Tor") + log.debug("We now have the following circuits: ") + for circuit in state.circuits.values(): + log.debug(" * %s" % circuit) + config.tor.socks_port = yield state.protocol.get_conf("SocksPort") + config.tor.control_port = yield state.protocol.get_conf("ControlPort") + + def setup_failed(arg): + log.exception(arg) + raise UnableTorStartTor + + def setup_complete(proto): + """ + Called when we read from stdout that Tor has reached 100%. + """ + log.debug("Building a TorState") + state = TorState(proto.tor_protocol) + state.post_bootstrap.addCallback(state_complete) + state.post_bootstrap.addErrback(setup_failed) + return state.post_bootstrap + + def updates(prog, tag, summary): + log.msg("%d%%: %s" % (prog, summary)) + + tor_config = TorConfig() + if config.tor.control_port: + tor_config.ControlPort = config.tor.control_port + else: + control_port = int(randomFreePort()) + tor_config.ControlPort = control_port + config.tor.control_port = control_port + + if config.tor.socks_port: + tor_config.SocksPort = config.tor.socks_port + else: + socks_port = int(randomFreePort()) + tor_config.SocksPort = socks_port + config.tor.socks_port = socks_port + + tor_config.save() + + log.debug("Setting control port as %s" % tor_config.ControlPort) + log.debug("Setting SOCKS port as %s" % tor_config.SocksPort) + + d = launch_tor(tor_config, reactor, progress_updates=updates) + d.addCallback(setup_complete) + d.addErrback(setup_failed) + return d + def runTest(cmd_line_options): config.cmd_line_options = cmd_line_options config.generateReportFilenames() @@ -436,6 +501,7 @@ def runTest(cmd_line_options): classes = findTestClassesFromFile(cmd_line_options['test']) test_cases, options = loadTestsAndOptions(classes, cmd_line_options) + if config.privacy.includepcap: from ooni.utils.txscapy import ScapyFactory, ScapySniffer try: @@ -451,4 +517,21 @@ def runTest(cmd_line_options): sniffer = ScapySniffer(config.reports.pcap) config.scapyFactory.registerProtocol(sniffer) - return runTestCases(test_cases, options, cmd_line_options) + # If we should start Tor then start it. Once Tor has started we will make + # sure. If not we assume that it is already running + if config.advanced.start_tor: + def tor_startup_failed(failure): + log.err(failure) + + def tor_started(): + return runTestCases(test_cases, + options, cmd_line_options) + + d = startTor() + d.addCallback(tor_started) + d.addErrback(tor_startup_failed) + return d + + else: + return runTestCases(test_cases, + options, cmd_line_options) diff --git a/ooni/utils/net.py b/ooni/utils/net.py index df98412..12d1939 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -10,6 +10,8 @@ # see attached LICENCE file import sys +import socket +from random import randint from zope.interface import implements from twisted.internet import protocol, defer @@ -123,6 +125,30 @@ def getIfaces(platform_name=None): else: raise UnsupportedPlatform +def randomFreePort(addr="127.0.0.1"): + """ + Args: + + addr (str): the IP address to attempt to bind to. + + Returns an int representing the free port number at the moment of calling + + Note: there is no guarantee that some other application will attempt to + bind to this port once this function has been called. + """ + free = False + while not free: + port = randint(1024, 65535) + s = socket.socket() + try: + s.bind((addr, port)) + free = True + except: + pass + s.close() + return port + + def checkInterfaces(ifaces=None, timeout=1): """ @param ifaces: diff --git a/ooniprobe.conf b/ooniprobe.conf index 5fa0743..6777fde 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -23,9 +23,16 @@ advanced: geoip_data_dir: /usr/share/GeoIP/ debug: true threadpool_size: 10 - tor_socksport: 9050 + + tor_binary: '/usr/sbin/tor' # For auto detection interface: auto # Of specify a specific interface #interface: wlan0 + start_tor: true +tor: + #socks_port: 9050 + #control_port: 9051 + # Specify the absolute path to the Tor bridges to use for testing + bridges: bridges.list

1 0

[ooni-probe/master] Improve the reporting of HTTP Test template. Include the reason of the failure for every request.
by art＠torproject.org 26 Nov '12

26 Nov '12

commit 44859c555f34f6b5e0a65546b476d3ba2e158bad Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 26 22:54:42 2012 +0100 Improve the reporting of HTTP Test template. Include the reason of the failure for every request. * Extend config file to support the tor related options * Create ooniprobe.sample * Add ooniprobe.conf to .gitignore --- .gitignore | 1 + ooni/config.py | 15 ++++++++++++++- ooni/templates/httpt.py | 45 ++++++++++++++++++++++++--------------------- ooniprobe.conf | 2 +- ooniprobe.conf.sample | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index d1015ab..4cb0775 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ pcaps/ report*.yaml docs/build/* data/*.dat +ooniprobe.conf diff --git a/ooni/config.py b/ooni/config.py index edfb196..1c40b32 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -30,12 +30,24 @@ resume_filename = None # There should be a more twisted way of doing this. start_reactor = True +tor_state = None +tor_control = None + +config_file = None +sample_config_file = None + def get_root_path(): this_directory = os.path.dirname(__file__) root = os.path.join(this_directory, '..') root = os.path.abspath(root) return root +def createConfigFile(): + """ + XXX implement me + """ + sample_config_file = os.path.join(get_root_path(), 'ooniprobe.conf.sample') + def loadConfigFile(): """ This is a helper function that makes sure that the configuration attributes @@ -45,8 +57,9 @@ def loadConfigFile(): try: f = open(config_file) except IOError: + createConfigFile() raise Exception("Unable to open config file. "\ - "Create a config file called ooniprobe.conf") + "Copy ooniprobe.conf.sample to ooniprobe.conf") config_file_contents = '\n'.join(f.readlines()) configuration = yaml.safe_load(config_file_contents) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 480d011..b8bd9a7 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -101,7 +101,7 @@ class HTTPTest(NetTestCase): def processInputs(self): pass - def addToReport(self, request, response=None, response_body=None): + def addToReport(self, request, response=None, response_body=None, failure=None): """ Adds to the report the specified request and response. @@ -111,6 +111,8 @@ class HTTPTest(NetTestCase): response (instance): An instance of :class:twisted.web.client.Response. Note: headers is our modified True Headers version. + + failure (instance): An instance of :class:twisted.internet.failure.Failure """ log.debug("Adding %s to report" % request) request_response = { @@ -127,6 +129,26 @@ class HTTPTest(NetTestCase): 'body': response_body, 'code': response.code } + if failure: + if isinstance(failure.value, ConnectionRefusedError): + log.err("Connection refused. The backend may be down") + request_response['failure'] = 'connection_refused_error' + + elif isinstance(failure.value, SOCKSError): + log.err("Sock error. The SOCKS proxy may be down") + request_response['failure'] = 'socks_error' + + elif isinstance(failure.value, DNSLookupError): + log.err("DNS lookup failure") + request_response['failure'] = 'dns_lookup_error' + + elif isinstance(failure.value, TCPTimedOutError): + log.err("TCP Timed Out Error") + request_response['failure'] = 'tcp_timed_out_error' + + elif isinstance(failure.value, ResponseNeverReceived): + log.err("Response Never Received") + request_response['failure'] = 'response_never_received' self.report['requests'].append(request_response) def _processResponseBody(self, response_body, request, response, body_processor): @@ -296,26 +318,7 @@ class HTTPTest(NetTestCase): def errback(failure, request): failure.trap(ConnectionRefusedError, SOCKSError, DNSLookupError, TCPTimedOutError) log.err("Error performing %s" % request) - self.addToReport(request) - if isinstance(failure.value, ConnectionRefusedError): - log.err("Connection refused. The backend may be down") - self.report['failure'] = 'connection_refused_error' - - elif isinstance(failure.value, SOCKSError): - log.err("Sock error. The SOCKS proxy may be down") - self.report['failure'] = 'socks_error' - - elif isinstance(failure.value, DNSLookupError): - log.err("DNS lookup failure") - self.report['failure'] = 'dns_lookup_error' - - elif isinstance(failure.value, TCPTimedOutError): - log.err("TCP Timed Out Error") - self.report['failure'] = 'tcp_timed_out_error' - - elif isinstance(failure.value, ResponseNeverReceived): - log.err("Response Never Received") - self.report['failure'] = 'response_never_received' + self.addToReport(request, failure=failure) return d = agent.request(request['method'], request['url'], headers, diff --git a/ooniprobe.conf b/ooniprobe.conf index 6777fde..b553a37 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -15,7 +15,7 @@ privacy: # Should we include the ASN of the probe in the report? includecity: false # Should we collect a full packet capture on the client? - includepcap: true + includepcap: false advanced: # XXX change this to point to the directory where you have stored the GeoIP # database file. This should be the directory in which OONI is installed diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample new file mode 100644 index 0000000..a032c0c --- /dev/null +++ b/ooniprobe.conf.sample @@ -0,0 +1,37 @@ +# This is the configuration file for OONIProbe +# This file follows the YAML markup format: http://yaml.org/spec/1.2/spec.html +# Keep in mind that indentation matters. + +basic: + # Where OONIProbe should be writing it's log file + logfile: ooniprobe.log +privacy: + # Should we include the IP address of the probe in the report? + includeip: false + # Should we include the ASN of the probe in the report? + includeasn: false + # Should we include the ASN of the probe in the report? + includecountry: false + # Should we include the ASN of the probe in the report? + includecity: false + # Should we collect a full packet capture on the client? + includepcap: false +advanced: + # XXX change this to point to the directory where you have stored the GeoIP + # database file. This should be the directory in which OONI is installed + # /path/to/ooni-probe/data/ + geoip_data_dir: /usr/share/GeoIP/ + debug: true + threadpool_size: 10 + tor_binary: '/usr/sbin/tor' + # For auto detection + interface: auto + # Of specify a specific interface + #interface: wlan0 + start_tor: true +tor: + #socks_port: 9050 + #control_port: 9051 + # Specify the absolute path to the Tor bridges to use for testing + bridges: bridges.list +

1 0

[metrics-tasks/master] Add total excluded advertised bandwidth (#1854).
by karsten＠torproject.org 26 Nov '12

26 Nov '12

commit d279b3a6c37f98330f3ba6f1a5e75351d3204f13 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 26 16:38:55 2012 -0500 Add total excluded advertised bandwidth (#1854). --- task-1854/plot-entropy.R | 24 +++++++++++++++--------- task-1854/pyextract.py | 29 +++++++++++++++++++---------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/task-1854/plot-entropy.R b/task-1854/plot-entropy.R index 34635e3..95b8b18 100644 --- a/task-1854/plot-entropy.R +++ b/task-1854/plot-entropy.R @@ -3,39 +3,45 @@ library(reshape) library(scales) e <- read.csv("extracted.csv", header = FALSE, - col.names = c("validafter", "min_adv_bw", "relays", "linf", "graph"), - stringsAsFactor = FALSE) + col.names = c("validafter", "min_adv_bw", "relays", "linf", + "excl_adv_bw", "graph"), stringsAsFactor = FALSE) l <- e[e$graph == 'last', ] -l <- data.frame(x = l$min_adv_bw, relays = l$relays, linf = l$linf) +l <- data.frame(x = l$min_adv_bw, relays = l$relays, + excladvbw = l$excl_adv_bw, linf = l$linf) l <- melt(l, "x") ggplot(l, aes(x = x, y = value)) + geom_line() + facet_grid(variable ~ ., scales = "free_y") + scale_x_log10(name = "\nAdvertised bandwidth cutoff in B/s (log scale)") + -scale_y_continuous(name = "") + +scale_y_continuous(name = paste("Number of relays, excluded advertised", + "bandwidth, or linf\n")) + opts(title = paste("Consensus with valid-after time ", max(e$validafter), "\n", sep = "")) l <- e[e$graph == 'last', ] -l <- data.frame(x = l$min_adv_bw, relays = l$relays, linf = l$linf) +l <- data.frame(x = l$min_adv_bw, relays = l$relays, + excladvbw = l$excl_adv_bw, linf = l$linf) l <- melt(l, "x") ggplot(l, aes(x = x, y = value)) + geom_line() + facet_grid(variable ~ ., scales = "free_y") + scale_x_log10(name = "\nAdvertised bandwidth cutoff in B/s (log scale)") + -scale_y_log10(name = "Number of relays or linf (log scale)") + +scale_y_log10(name = paste("Number of relays, excluded advertised", + "bandwidth, or linf (log scale)\n")) + opts(title = paste("Consensus with valid-after time ", max(e$validafter), "\n", sep = "")) l <- e[e$graph == 'last' & e$min_adv_bw >= 10000 & e$min_adv_bw <= 100000, ] -l <- data.frame(x = l$min_adv_bw, relays = l$relays, linf = l$linf) +l <- data.frame(x = l$min_adv_bw, relays = l$relays, + excladvbw = l$excl_adv_bw, linf = l$linf) l <- melt(l, "x") ggplot(l, aes(x = x, y = value)) + geom_line() + facet_grid(variable ~ ., scales = "free_y") + -scale_x_log10(name = "\nAdvertised bandwidth cutoff in B/s (log scale)") + -scale_y_continuous(name = "") + +scale_x_log10(name = "\nAdvertised bandwidth cutoff in B/s (zoomed, log scale)") + +scale_y_continuous(name = paste("Number of relays, excluded advertised", + "bandwidth, or linf\n")) + opts(title = paste("Consensus with valid-after time ", max(e$validafter), "\n", sep = "")) diff --git a/task-1854/pyextract.py b/task-1854/pyextract.py index 4220a2a..33614e2 100644 --- a/task-1854/pyextract.py +++ b/task-1854/pyextract.py @@ -3,25 +3,34 @@ import sys def main(): out_file = open('extracted.csv', 'w') - last_validafter = '' - last_lines = [] + prev_validafter, max_validafter = '', '' + max_lines = [] + prev_relays, prev_min_adv_bw = 0, 0 for line in open('entropy.csv'): parts = line.strip().split(',') validafter = parts[0] min_adv_bw = int(parts[1]) - relays = parts[2] + relays = int(parts[2]) linf = parts[3] - if last_validafter != validafter: - last_lines = [] + if validafter != prev_validafter: + prev_relays, prev_min_adv_bw, excluded_adv_bw = 0, 0, 0 next_cutoffs = [0, 10000, 20000, 30000, 40000, 50000, 75000, 100000, 100000000000000000000] + excluded_adv_bw += (prev_relays - relays) * prev_min_adv_bw + extended_line = "%s,%d" % (line.strip(), excluded_adv_bw, ) + if validafter > max_validafter: + max_validafter = validafter + max_lines = [] + if validafter == max_validafter: + max_lines.append(extended_line) while min_adv_bw >= next_cutoffs[0]: - out_file.write("%s,%d,%s,%s,history\n" % (validafter, - next_cutoffs[0], relays, linf, )) + out_file.write("%s,%d,%d,%s,%d,history\n" % (validafter, + next_cutoffs[0], relays, linf, excluded_adv_bw, )) next_cutoffs.pop(0) - last_lines.append(line.strip()) - last_validafter = validafter - for line in last_lines: + prev_validafter = validafter + prev_relays = relays + prev_min_adv_bw = min_adv_bw + for line in max_lines: out_file.write(line + ",last\n") if __name__ == '__main__':

1 0

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

26 Nov '12

commit 49de4dda062dc587711de17811fb8a488adf209c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 26 21:15:14 2012 +0000 Update translations for orbot --- values-he/strings.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/values-he/strings.xml b/values-he/strings.xml index 002f24e..31c9a02 100644 --- a/values-he/strings.xml +++ b/values-he/strings.xml @@ -30,6 +30,8 @@ <string name="menu_verify">בדיקה</string> <string name="menu_exit">צא</string> <string name="press_to_start">-נגיעה ארוכה להתחלה-</string> + <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string> + <string name="pref_trans_proxy_title">פרוקסי שקוף</string> <string name="pref_transparent_all_title">הכל דרך Tor</string> <string name="pref_transparent_port_title">רשימת פורטים</string> <string name="pref_has_root">דרוש רוט</string>

1 0

r25912: {website} add a new mirror. (in website/trunk: . include)
by Andrew Lewman 26 Nov '12

26 Nov '12

Author: phobos Date: 2012-11-26 21:06:53 +0000 (Mon, 26 Nov 2012) New Revision: 25912 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add a new mirror. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-11-26 21:03:28 UTC (rev 25911) +++ website/trunk/include/mirrors-table.wmi 2012-11-26 21:06:53 UTC (rev 25912) @@ -1,32 +1,32 @@ <tr> - <td>CZ</td> + <td>TN</td> - <td>Lightning-bolt.net</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> - <td><a href="http://torproject.lightning-bolt.net/">http</a></td> <td> - </td> + <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> + <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>PT</td> + <td>NL</td> - <td>5ª Coluna</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.pt/dist/">http</a></td> - <td><a href="http://torproject.pt/">http</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>NL</td> + <td>DK</td> - <td>CCC</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -171,6 +171,40 @@ <tr> + <td>IS</td> + + <td>myRL.net</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + + <td>crazyhaze.de</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>RO</td> <td>me0w.cc</td> @@ -188,6 +222,23 @@ <tr> + <td>CH</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.pillo-srv.ch/dist/">http</a></td> + <td><a href="http://torproject.pillo-srv.ch/">http</a></td> + <td><a href="https://torproject.pillo-srv.ch/dist/">https</a></td> + <td><a href="https://torproject.pillo-srv.ch/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -273,83 +324,83 @@ <tr> - <td>DE</td> + <td>AT</td> - <td>chaos darmstadt</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> - <td>HU</td> + <td>US</td> - <td>Unknown</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist/">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> + <td><a href="http://tor.mirrors.samwhited.com/dist/">http</a></td> + <td><a href="http://tor.mirrors.samwhited.com/">http</a></td> + <td><a href="https://tor.mirrors.samwhited.com/dist/">https</a></td> + <td><a href="https://tor.mirrors.samwhited.com/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> </tr> <tr> <td>DE</td> - <td>beme it</td> + <td>factor.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>FR</td> - <td>NW Linux</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td> - </td> </tr> <tr> - <td>IL</td> + <td>DE</td> - <td>Host4site</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,15 +409,15 @@ <tr> - <td>DE</td> + <td>US</td> - <td>borgmann.tv</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> + <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> + <td><a href="http://tor.onthegetgo.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -375,83 +426,83 @@ <tr> - <td>DE</td> + <td>HU</td> - <td>spline</td> + <td>Unknown</td> <td>Up to date</td> - <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> - <td><a href="http://tor.spline.de/dist/">http</a></td> - <td><a href="http://tor.spline.de/">http</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> <td> - </td> - <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>GB</td> + <td>DE</td> - <td>torland</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>IS</td> + <td>US</td> - <td>TheOnionRouter</td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> - <td>TN</td> + <td>US</td> - <td></td> + <td>Xpdm</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> - <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> - <td><a href="https://torproject.antagonism.org/">https</a></td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>IL</td> - <td>Amorphis</td> + <td>Host4site</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -460,15 +511,15 @@ <tr> - <td>US</td> + <td>DE</td> - <td>Quintex</td> + <td>borgmann.tv</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tormirror.quintex.com/dist/">http</a></td> - <td><a href="http://tormirror.quintex.com/">http</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -477,15 +528,15 @@ <tr> - <td>DK</td> + <td>FR</td> - <td>Zentrum der Gesundheit</td> + <td>LazyTiger</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,104 +545,104 @@ <tr> - <td>EE</td> + <td>DE</td> - <td>CyberSIDE</td> + <td>spline</td> - <td>Out of date</td> + <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>IS</td> + <td>GB</td> - <td>myRL.net</td> + <td>torland</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">https</a></td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>AT</td> + <td>IS</td> - <td>FoDT</td> + <td>TheOnionRouter</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.fodt.co.at/dist/">http</a></td> - <td><a href="http://tor.fodt.co.at/">http</a></td> - <td><a href="https://tor.fodt.co.at/dist/">https</a></td> - <td><a href="https://tor.fodt.co.at/">https</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>SE</td> - <td>crazyhaze.de</td> + <td>homosu</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>LT</td> + <td>DE</td> - <td></td> + <td>[[:bbs:]]</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>AT</td> + <td>INT</td> - <td>cyberarmy</td> + <td>CoralCDN</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> @@ -600,45 +651,28 @@ <td></td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mirrors.samwhited.com/dist/">http</a></td> - <td><a href="http://tor.mirrors.samwhited.com/">http</a></td> - <td><a href="https://tor.mirrors.samwhited.com/dist/">https</a></td> - <td><a href="https://tor.mirrors.samwhited.com/">https</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> - <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> -</tr> - -<tr> - - <td>DE</td> - - <td>factor.cc</td> - - <td>Out of date</td> - <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>FR</td> + <td>EE</td> - <td></td> + <td>CyberSIDE</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> - <td><a href="http://tor.mirror.chekanov.net/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,15 +681,15 @@ <tr> - <td>US</td> + <td>NL</td> - <td></td> + <td>Amorphis</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> - <td><a href="http://tor.onthegetgo.com/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -664,19 +698,19 @@ <tr> - <td>US</td> + <td>LT</td> - <td>Xpdm</td> + <td></td> <td>Out of date</td> <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -698,15 +732,15 @@ <tr> - <td>FR</td> + <td>US</td> - <td>LazyTiger</td> + <td>hessmo</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -715,15 +749,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td>searchprivate</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -732,32 +766,32 @@ <tr> - <td>DE</td> + <td>IN</td> - <td>[[:bbs:]]</td> + <td>India Tor Fans</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>DE</td> <td></td> <td>Out of date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://tor.freie-re.de/dist/">http</a></td> + <td><a href="http://tor.freie-re.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -766,15 +800,15 @@ <tr> - <td>US</td> + <td>CZ</td> - <td>hessmo</td> + <td>Lightning-bolt.net</td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -785,13 +819,13 @@ <td>US</td> - <td>searchprivate</td> + <td>Quintex</td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> + <td><a href="http://tormirror.quintex.com/dist/">http</a></td> + <td><a href="http://tormirror.quintex.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -800,15 +834,15 @@ <tr> - <td>IN</td> + <td>PT</td> - <td>India Tor Fans</td> + <td>5ª Coluna</td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://www.torproject.org.in/dist/">http</a></td> - <td><a href="http://www.torproject.org.in/">http</a></td> + <td><a href="http://torproject.pt/dist/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -817,15 +851,15 @@ <tr> - <td>DE</td> + <td>NL</td> - <td></td> + <td>BIT BV</td> - <td>Out of date</td> + <td>Unknown</td> + <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> + <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> - <td><a href="http://tor.freie-re.de/dist/">http</a></td> - <td><a href="http://tor.freie-re.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -834,19 +868,19 @@ <tr> - <td>NL</td> + <td>AT</td> - <td>BIT BV</td> + <td>FoDT</td> <td>Unknown</td> - <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> - <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> + <td><a href="http://tor.fodt.co.at/dist/">http</a></td> + <td><a href="http://tor.fodt.co.at/">http</a></td> + <td><a href="https://tor.fodt.co.at/dist/">https</a></td> + <td><a href="https://tor.fodt.co.at/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -916,20 +950,3 @@ <td> - </td> <td> - </td> </tr> - -<tr> - - <td>INT</td> - - <td>CoralCDN</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-11-26 21:03:28 UTC (rev 25911) +++ website/trunk/update-mirrors.pl 2012-11-26 21:06:53 UTC (rev 25912) @@ -1106,6 +1106,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror078 => { + adminContact => "", + orgName => "", + isoCC => "CH", + subRegion => "", + region => "CH", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://torproject.pillo-srv.ch/", + httpsWebsiteMirror => "https://torproject.pillo-srv.ch/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://torproject.pillo-srv.ch/dist/", + httpsDistMirror => "https://torproject.pillo-srv.ch/dist/", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

r25911: {website} fix the link to RIAA vs. Verizon pdf on eff's site. Thanks t (website/trunk/eff/en)
by Andrew Lewman 26 Nov '12

26 Nov '12

Author: phobos Date: 2012-11-26 21:03:28 +0000 (Mon, 26 Nov 2012) New Revision: 25911 Modified: website/trunk/eff/en/tor-dmca-response.wml Log: fix the link to RIAA vs. Verizon pdf on eff's site. Thanks to Christian for the notice. Modified: website/trunk/eff/en/tor-dmca-response.wml =================================================================== --- website/trunk/eff/en/tor-dmca-response.wml 2012-11-26 16:33:17 UTC (rev 25910) +++ website/trunk/eff/en/tor-dmca-response.wml 2012-11-26 21:03:28 UTC (rev 25911) @@ -63,8 +63,8 @@ conduit. Instead, the "conduit" safe harbor of section 512(a) of the DMCA has different and less burdensome eligibility requirements, as the D.C. Circuit Court of Appeals held in RIAA v. Verizon (see <a -href="https://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf" -title="https://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf">https://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf</a>) +href="https://www.eff.org/sites/default/files/filenode/RIAA_v_Verizon/20030121-ri…"> +https://www.eff.org/sites/default/files/filenode/RIAA_v_Verizon/20030121-riaa-v-verizon-order.pdf</a>) and the Eighth Circuit Court of Appeals confirmed in RIAA v. Charter (see <a href="https://w2.eff.org/IP/P2P/Charter/033802P.pdf" title="https://w2.eff.org/IP/P2P/Charter/033802P.pdf">https://w2.eff.org/IP/P2P/Charter/033802P.pdf</a>).</p>

1 0