- tor-commits - lists.torproject.org

[metrics-web/master] Stop wasting graph space for cut out days.
by karsten＠torproject.org 29 Aug '12

29 Aug '12

commit 3d5bc767edcae80fd5759c5a349c16d207d68e7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 29 12:30:59 2012 +0200 Stop wasting graph space for cut out days. --- rserve/graphs.R | 78 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 38 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 4799726..83d380d 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -278,16 +278,16 @@ date_breaks <- function(days) { } plot_networksize <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, avg_running AS relays FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) relays <- fetch(rs, n = -1) q <- paste("SELECT date, avg_running AS bridges ", "FROM bridge_network_size WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 1", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bridges <- fetch(rs, n = -1) dbDisconnect(con) @@ -325,11 +325,12 @@ plot_networksize <- function(start, end, path, dpi) { } plot_cloudbridges <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, avg_running_ec2 ", "FROM bridge_network_size WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 1", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bridges <- fetch(rs, n = -1) dbDisconnect(con) @@ -358,17 +359,16 @@ plot_cloudbridges <- function(start, end, path, dpi) { } plot_relaycountries <- function(start, end, country, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) if (country == "all") { q <- paste("SELECT date, avg_running AS relays FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") } else { q <- paste("SELECT date, relays FROM relay_countries ", "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1 ", - "AND country = '", country, "'", sep = "") + "' AND country = '", country, "'", sep = "") } rs <- dbSendQuery(con, q) u <- fetch(rs, n = -1) @@ -403,11 +403,11 @@ plot_relaycountries <- function(start, end, country, path, dpi) { } plot_versions <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, version, relays FROM relay_versions ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) versions <- fetch(rs, n = -1) dbDisconnect(con) @@ -439,11 +439,12 @@ plot_versions <- function(start, end, path, dpi) { } plot_platforms <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user=dbuser, password=dbpassword, dbname=db) q <- paste("SELECT date, avg_linux, avg_darwin, avg_bsd, avg_windows, ", "avg_other FROM relay_platforms WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 1", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) platforms <- fetch(rs, n = -1) dbDisconnect(con) @@ -471,16 +472,15 @@ plot_platforms <- function(start, end, path, dpi) { } plot_bandwidth <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, bwadvertised FROM total_bandwidth ", - "WHERE date >= '", start, "' AND date <= '", end, "' ", - "AND date < current_date - 3", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bw_desc <- fetch(rs, n = -1) q <- paste("SELECT date, read, written FROM total_bwhist ", - "WHERE date >= '", start, "' AND date <= '", end, "' ", - "AND date < current_date - 3", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bw_hist <- fetch(rs, n = -1) dbDisconnect(con) @@ -509,11 +509,12 @@ plot_bandwidth <- function(start, end, path, dpi) { } plot_bwhist_flags <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, isexit, isguard, read, written ", "FROM bwhist_flags WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 3", sep = "") + "'", sep = "") rs <- dbSendQuery(con, q) bw <- fetch(rs, n = -1) dbDisconnect(con) @@ -555,12 +556,12 @@ plot_bwhist_flags <- function(start, end, path, dpi) { } plot_dirbytes <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, dr, dw, brp, bwp, brd, bwd FROM user_stats ", "WHERE country = 'zy' AND bwp / bwd <= 3 AND date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 3 ", - "ORDER BY date", sep = "") + "' AND date <= '", end, "' ORDER BY date", sep = "") rs <- dbSendQuery(con, q) dir <- fetch(rs, n = -1) dbDisconnect(con) @@ -591,23 +592,23 @@ plot_dirbytes <- function(start, end, path, dpi) { } plot_relayflags <- function(start, end, flags, granularity, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) if (granularity == 'day') { columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") q <- paste("SELECT date, ", columns, " FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) networksize <- fetch(rs, n = -1) dbDisconnect(con) dbUnloadDriver(drv) networksize <- melt(networksize, id = "date") networksize <- rbind(data.frame( - date = as.Date(rep(end, 5)), + date = as.Date(end) + 1, variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), - value = rep(NA, 5)), networksize) + value = NA), networksize) dates <- seq(from = as.Date(start, "%Y-%m-%d"), to = as.Date(end, "%Y-%m-%d"), by="1 day") missing <- setdiff(dates, networksize$date) @@ -637,15 +638,14 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") q <- paste("SELECT validafter, ", columns, " FROM network_size_hour ", "WHERE DATE(validafter) >= '", start, - "' AND DATE(validafter) <= '", end, "' ", - "AND DATE(validafter) < current_date - 1", sep = "") + "' AND DATE(validafter) <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) networksize <- fetch(rs, n = -1) dbDisconnect(con) dbUnloadDriver(drv) networksize <- melt(networksize, id = "validafter") networksize <- rbind(data.frame( - validafter = as.POSIXct(rep(paste(end, "00:00:00"), 5)), + validafter = as.POSIXct(rep(paste(end, "23:59:00"), 5)), variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), value = rep(NA, 5)), networksize) @@ -666,13 +666,14 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { plot_direct_users <- function(start, end, country, events, path, nocutoff, dpi) { + if (nocutoff != "off") { + end <- min(end, as.character(Sys.Date() - 4)) + } drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, r, bwp, brn, bwn, brp, bwr, brr, country ", "FROM user_stats WHERE date >= '", start, "' AND date <= '", end, - "' ", ifelse(nocutoff == "off", - " AND date < current_date - 3 ", ""), - " AND (country = 'zy'", ifelse(country == "all", "", + "' AND (country = 'zy'", ifelse(country == "all", "", paste(" OR country = '", country, "'", sep = "")), ")", sep = "") rs <- dbSendQuery(con, q) u <- fetch(rs, n = -1) @@ -743,12 +744,12 @@ plot_direct_users <- function(start, end, country, events, path, nocutoff, } plot_bridge_users <- function(start, end, country, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, users FROM bridge_stats ", "WHERE date >= '", start, "' AND date <= '", end, "' ", - "AND date < current_date - 3", - " AND country = '", ifelse(country == "all", "zy", country), "'", + "AND country = '", ifelse(country == "all", "zy", country), "'", sep = "") rs <- dbSendQuery(con, q) bridgeusers <- fetch(rs, n = -1) @@ -782,12 +783,12 @@ plot_bridge_users <- function(start, end, country, path, dpi) { } plot_torperf <- function(start, end, source, filesize, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, q1, md, q3 FROM torperf_stats ", "WHERE source = '", paste(source, filesize, sep = "-"), - "' AND date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "' AND date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) torperf <- fetch(rs, n = -1) dbDisconnect(con) @@ -832,13 +833,13 @@ plot_torperf <- function(start, end, source, filesize, path, dpi) { plot_torperf_failures <- function(start, end, source, filesize, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, timeouts, failures, requests ", "FROM torperf_stats WHERE source = '", paste(source, filesize, sep = "-"), - "' AND date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "' AND date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) torperf <- fetch(rs, n = -1) dbDisconnect(con) @@ -886,12 +887,12 @@ plot_torperf_failures <- function(start, end, source, filesize, path, } plot_connbidirect <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT DATE(statsend) AS date, readnum, writenum, bothnum ", "FROM connbidirect WHERE DATE(statsend) >= '", start, - "' AND DATE(statsend) <= '", end, "' AND DATE(statsend) < ", - "current_date - 1", sep = "") + "' AND DATE(statsend) <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) c <- fetch(rs, n = -1) dbDisconnect(con) @@ -987,17 +988,18 @@ plot_almost_fast_exits <- function(start, end, path, dpi) { } plot_bandwidth_flags <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, isexit, isguard, bwadvertised AS value ", "FROM bandwidth_flags WHERE date >= '", start, "' AND date <= '", - end, "' AND date < current_date - 3", sep = "") + end, "'", sep = "") rs <- dbSendQuery(con, q) bw_desc <- fetch(rs, n = -1) q <- paste("SELECT date, isexit, isguard, ", "(read + written) / (2 * 86400) ", "AS value FROM bwhist_flags WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 3", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bw_hist <- fetch(rs, n = -1) dbDisconnect(con)

1 0

[torbrowser/master] bump Firefox to 15.0, update libevent, https-everywhere, and noscript as well
by erinn＠torproject.org 29 Aug '12

29 Aug '12

commit 2c46dfe143f6bc0cf22aaea424c1d25b30fa398f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 29 05:18:02 2012 +0100 bump Firefox to 15.0, update libevent, https-everywhere, and noscript as well --- build-scripts/versions-alpha.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 4efc8db..6fc7cd5 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 -LIBEVENT_VER=2.0.19-stable +LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.3.20-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=14.0.1 +FIREFOX_VER=15.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.4.9 -HTTPSEVERYWHERE_VER=3.0development.5 +NOSCRIPT_VER=2.5.2 +HTTPSEVERYWHERE_VER=3.0development.6 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0

1 0

[torbrowser/maint-2.3] bump Firefox to 15.0, update libevent, https-everywhere, and noscript as well
by erinn＠torproject.org 29 Aug '12

29 Aug '12

commit 2c46dfe143f6bc0cf22aaea424c1d25b30fa398f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 29 05:18:02 2012 +0100 bump Firefox to 15.0, update libevent, https-everywhere, and noscript as well --- build-scripts/versions-alpha.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 4efc8db..6fc7cd5 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 -LIBEVENT_VER=2.0.19-stable +LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.3.20-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=14.0.1 +FIREFOX_VER=15.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.4.9 -HTTPSEVERYWHERE_VER=3.0development.5 +NOSCRIPT_VER=2.5.2 +HTTPSEVERYWHERE_VER=3.0development.6 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0

1 0

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 29 Aug '12

29 Aug '12

commit 87a3b8262c2de9b494a9475347d8bbe8090e47a7 Merge: 3356ab5 2c46dfe Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 29 05:18:25 2012 +0100 Merge branch 'maint-2.3' build-scripts/versions-alpha.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

1 0

[stem/master] Implement Controller.repurpose_circuit
by atagar＠torproject.org 28 Aug '12

28 Aug '12

commit d27fbbb06a247d3fb12684f76f2a7f5a51a36b04 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Aug 27 11:02:48 2012 -0700 Implement Controller.repurpose_circuit --- stem/control.py | 22 ++++++++++++++++++++++ test/integ/control/controller.py | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index ece7f03..a9df1ba 100644 --- a/stem/control.py +++ b/stem/control.py @@ -29,6 +29,7 @@ interacting at a higher level. |- signal - sends a signal to the tor client |- new_circuit - create new circuits |- extend_circuit - create new circuits and extend existing ones + |- repurpose_circuit - change a circuit's purpose |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info @@ -1055,6 +1056,27 @@ class Controller(BaseController): raise stem.socket.ProtocolError("SIGNAL response contained unrecognized status code: %s" % response.code) + def repurpose_circuit(self, circuit_id, purpose): + """ + Changes a circuit's purpose. Currently, two purposes are recognized... + * general + * controller + + :param int circuit_id: id of the circuit whose purpose is to be changed + :param str purpose: purpose (either "general" or "controller") + + :raises: :class:`stem.socket.InvalidArguments` if the circuit doesn't exist or if the purpose was invalid + """ + + response = self.msg("SETCIRCUITPURPOSE %s purpose=%s" % (str(circuit_id), purpose)) + stem.response.convert("SINGLELINE", response) + + if not response.is_ok(): + if response.code == "552": + raise stem.socket.InvalidRequest(response.code, response.message) + else: + raise stem.socket.ProtocolError("SETCIRCUITPURPOSE returned unexpected response code: %s" % response.code) + def new_circuit(self, path = None, purpose = "general"): """ Requests a new circuit. If the path isn't provided, one is automatically diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index e1e24d8..5a078c0 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -376,4 +376,23 @@ class TestController(unittest.TestCase): self.assertRaises(stem.socket.InvalidRequest, controller.extend_circuit, "foo") self.assertRaises(stem.socket.InvalidRequest, controller.extend_circuit, 0, "thisroutershouldntexistbecausestemexists!@##$%#") self.assertRaises(stem.socket.InvalidRequest, controller.extend_circuit, 0, "thisroutershouldntexistbecausestemexists!@##$%#", "foo") + + def test_repurpose_circuit(self): + if test.runner.require_control(self): return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + first_circ = controller.get_info('circuit-status').splitlines()[0].split() + circ_id = int(first_circ[0]) + purpose = "CONTROLLER" + if "PURPOSE=CONTROLLER" in first_circ: + purpose = "GENERAL" + controller.repurpose_circuit(circ_id, purpose) + purpose_arg = "PURPOSE=%s" % purpose + circ = filter(lambda line: int(line.split()[0]) == circ_id, controller.get_info('circuit-status').splitlines())[0] + self.assertTrue(purpose_arg in circ) + + self.assertRaises(stem.socket.InvalidRequest, controller.repurpose_circuit, 'f934h9f3h4', "fooo") + self.assertRaises(stem.socket.InvalidRequest, controller.repurpose_circuit, '4', "fooo")

1 0

[stem/master] Skipping repurpose_circuit() test if offline
by atagar＠torproject.org 28 Aug '12

28 Aug '12

commit d97a0c30002062ac0fbc45b32c2be6061cc35594 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 27 11:08:10 2012 -0700 Skipping repurpose_circuit() test if offline The repurpose_circuit() test uses 'GETINFO circuit-status' results which are empty when offline, causing an error... ====================================================================== ERROR: test_repurpose_circuit ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 386, in test_repurpose_circuit first_circ = controller.get_info('circuit-status').splitlines()[0].split() IndexError: list index out of range ---------------------------------------------------------------------- Ran 14 tests in 1.390s --- test/integ/control/controller.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 5a078c0..5f5113c 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -383,7 +383,13 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - first_circ = controller.get_info('circuit-status').splitlines()[0].split() + circuit_output = controller.get_info('circuit-status') + + # the circuit-status results will be empty if we don't have a connection + if circuit_output == '': + if test.runner.require_online(self): return + + first_circ = circuit_output.splitlines()[0].split() circ_id = int(first_circ[0]) purpose = "CONTROLLER" if "PURPOSE=CONTROLLER" in first_circ:

1 0

[stem/master] Adding a method for SETCIRCUITPURPOSE
by atagar＠torproject.org 28 Aug '12

28 Aug '12

commit 223ebc5617ce46007dfd5a9210e4ff91fb9767ea Merge: 3df65c0 d97a0c3 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 27 11:12:59 2012 -0700 Adding a method for SETCIRCUITPURPOSE cr atagar (https://trac.torproject.org/6670) stem/control.py | 22 ++++++++++++++++++++++ test/integ/control/controller.py | 25 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-)

1 0

[metrics-web/master] Add advertised bw/history graph by Exit/Guard flag.
by karsten＠torproject.org 28 Aug '12

28 Aug '12

commit 14fea500ec0747887fa67ebbb37804d1c76b5041 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 28 19:12:05 2012 +0200 Add advertised bw/history graph by Exit/Guard flag. Implements #6671. --- db/tordir.sql | 45 ++++++++++++++ etc/web.xml | 4 + rserve/csv.R | 26 ++++++++ rserve/graphs.R | 63 ++++++++++++++++++++ src/org/torproject/ernie/web/GraphDataServlet.java | 2 + src/org/torproject/ernie/web/RObjectGenerator.java | 2 + web/WEB-INF/network.jsp | 35 +++++++++++ 7 files changed, 177 insertions(+), 0 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index 93820bc..8aa039c 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -219,6 +219,15 @@ CREATE TABLE total_bwhist ( CONSTRAINT total_bwhist_pkey PRIMARY KEY(date) ); +-- TABLE bandwidth_flags +CREATE TABLE bandwidth_flags ( + date DATE NOT NULL, + isexit BOOLEAN NOT NULL, + isguard BOOLEAN NOT NULL, + bwadvertised BIGINT NOT NULL, + CONSTRAINT bandwidth_flags_pkey PRIMARY KEY(date, isexit, isguard) +); + -- TABLE bwhist_flags CREATE TABLE bwhist_flags ( date DATE NOT NULL, @@ -647,6 +656,40 @@ CREATE OR REPLACE FUNCTION refresh_total_bwhist() RETURNS INTEGER AS $$ END; $$ LANGUAGE plpgsql; +CREATE OR REPLACE FUNCTION refresh_bandwidth_flags() RETURNS INTEGER AS $$ + DECLARE + min_date TIMESTAMP WITHOUT TIME ZONE; + max_date TIMESTAMP WITHOUT TIME ZONE; + BEGIN + + min_date := (SELECT MIN(date) FROM updates); + max_date := (SELECT MAX(date) + 1 FROM updates); + + DELETE FROM bandwidth_flags WHERE date IN (SELECT date FROM updates); + EXECUTE ' + INSERT INTO bandwidth_flags (date, isexit, isguard, bwadvertised) + SELECT DATE(validafter) AS date, + BOOL_OR(isexit) AS isexit, + BOOL_OR(isguard) AS isguard, + (SUM(LEAST(bandwidthavg, bandwidthobserved)) + / relay_statuses_per_day.count)::BIGINT AS bwadvertised + FROM descriptor RIGHT JOIN statusentry + ON descriptor.descriptor = statusentry.descriptor + JOIN relay_statuses_per_day + ON DATE(validafter) = relay_statuses_per_day.date + WHERE isrunning = TRUE + AND validafter >= ''' || min_date || ''' + AND validafter < ''' || max_date || ''' + AND DATE(validafter) IN (SELECT date FROM updates) + AND relay_statuses_per_day.date >= ''' || min_date || ''' + AND relay_statuses_per_day.date < ''' || max_date || ''' + AND DATE(relay_statuses_per_day.date) IN + (SELECT date FROM updates) + GROUP BY DATE(validafter), isexit, isguard, relay_statuses_per_day.count'; + RETURN 1; + END; +$$ LANGUAGE plpgsql; + CREATE OR REPLACE FUNCTION refresh_bwhist_flags() RETURNS INTEGER AS $$ DECLARE min_date TIMESTAMP WITHOUT TIME ZONE; @@ -923,6 +966,8 @@ CREATE OR REPLACE FUNCTION refresh_all() RETURNS INTEGER AS $$ PERFORM refresh_total_bandwidth(); RAISE NOTICE '% Refreshing relay bandwidth history.', timeofday(); PERFORM refresh_total_bwhist(); + RAISE NOTICE '% Refreshing total relay bandwidth by flags.', timeofday(); + PERFORM refresh_bandwidth_flags(); RAISE NOTICE '% Refreshing bandwidth history by flags.', timeofday(); PERFORM refresh_bwhist_flags(); RAISE NOTICE '% Refreshing user statistics.', timeofday(); diff --git a/etc/web.xml b/etc/web.xml index 0931a71..ccf6dd2 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -193,6 +193,10 @@ </servlet-mapping> <servlet-mapping> <servlet-name>GraphImage</servlet-name> + <url-pattern>/bandwidth-flags.png</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>GraphImage</servlet-name> <url-pattern>/dirbytes.png</url-pattern> </servlet-mapping> <servlet-mapping> diff --git a/rserve/csv.R b/rserve/csv.R index cc50b8a..d7917e0 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -279,3 +279,29 @@ export_dirreq_stats <- function(path) { quote = FALSE, row.names = FALSE) } +export_bandwidth_flags <- function(path) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT date, isexit, isguard, bwadvertised AS value", + "FROM bandwidth_flags WHERE date < current_date - 3") + rs <- dbSendQuery(con, q) + bw_desc <- fetch(rs, n = -1) + q <- paste("SELECT date, isexit, isguard,", + "(read + written) / (2 * 86400) AS value", + "FROM bwhist_flags WHERE date < current_date - 3") + rs <- dbSendQuery(con, q) + bw_hist <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + bandwidth <- rbind(data.frame(bw_desc, type = "advbw"), + data.frame(bw_hist, type = "bwhist")) + bandwidth <- rbind( + data.frame(bandwidth[bandwidth$isguard == TRUE, ], flag = "guard"), + data.frame(bandwidth[bandwidth$isexit == TRUE, ], flag = "exit")) + bandwidth <- aggregate(list(value = bandwidth$value), + by = list(date = bandwidth$date, type = bandwidth$type, + flag = bandwidth$flag), FUN = sum) + write.csv(format(bandwidth, trim = TRUE, scientific = FALSE), path, + quote = FALSE, row.names = FALSE) +} + diff --git a/rserve/graphs.R b/rserve/graphs.R index 0434379..4799726 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -986,3 +986,66 @@ plot_almost_fast_exits <- function(start, end, path, dpi) { ggsave(filename = path, width = 8, height = 6, dpi = as.numeric(dpi)) } +plot_bandwidth_flags <- function(start, end, path, dpi) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT date, isexit, isguard, bwadvertised AS value ", + "FROM bandwidth_flags WHERE date >= '", start, "' AND date <= '", + end, "' AND date < current_date - 3", sep = "") + rs <- dbSendQuery(con, q) + bw_desc <- fetch(rs, n = -1) + q <- paste("SELECT date, isexit, isguard, ", + "(read + written) / (2 * 86400) ", + "AS value FROM bwhist_flags WHERE date >= '", start, + "' AND date <= '", end, "' AND date < current_date - 3", sep = "") + rs <- dbSendQuery(con, q) + bw_hist <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + bandwidth <- rbind(data.frame(bw_desc, type = "advertised bandwidth"), + data.frame(bw_hist, type = "bandwidth history")) + bandwidth <- rbind( + data.frame(bandwidth[bandwidth$isguard == TRUE, ], flag = "Guard"), + data.frame(bandwidth[bandwidth$isexit == TRUE, ], flag = "Exit")) + bandwidth <- aggregate(list(value = bandwidth$value), + by = list(date = bandwidth$date, type = bandwidth$type, + flag = bandwidth$flag), FUN = sum) + date_breaks <- date_breaks( + as.numeric(max(as.Date(bandwidth$date, "%Y-%m-%d")) - + min(as.Date(bandwidth$date, "%Y-%m-%d")))) + dates <- seq(from = as.Date(start, "%Y-%m-%d"), + to = as.Date(end, "%Y-%m-%d"), by = "1 day") + missing <- setdiff(dates, as.Date(bandwidth$date, + origin = "1970-01-01")) + if (length(missing) > 0) { + bandwidth <- rbind(bandwidth, + data.frame(date = as.Date(missing, origin = "1970-01-01"), + type = "advertised bandwidth", flag = "Exit", value = NA), + data.frame(date = as.Date(missing, origin = "1970-01-01"), + type = "bandwidth history", flag = "Exit", value = NA), + data.frame(date = as.Date(missing, origin = "1970-01-01"), + type = "advertised bandwidth", flag = "Guard", value = NA), + data.frame(date = as.Date(missing, origin = "1970-01-01"), + type = "bandwidth history", flag = "Guard", value = NA)) + } + bandwidth <- data.frame(date = bandwidth$date, + variable = as.factor(paste(bandwidth$flag, ", ", bandwidth$type, + sep = "")), value = bandwidth$value) + bandwidth$variable <- factor(bandwidth$variable, + levels = levels(bandwidth$variable)[c(3, 4, 1, 2)]) + ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value / 2^20, + colour = variable)) + + geom_line(size = 1) + + scale_x_date(name = paste("\nThe Tor Project - ", + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + + scale_y_continuous(name="Bandwidth (MiB/s)", + limits = c(0, max(bandwidth$value, na.rm = TRUE) / 2^20)) + + scale_colour_manual(name = "", + values = c("#E69F00", "#D6C827", "#009E73", "#00C34F")) + + opts(title = paste("Advertised bandwidth and bandwidth history by", + "relay flags"), legend.position = "top") + ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) +} + diff --git a/src/org/torproject/ernie/web/GraphDataServlet.java b/src/org/torproject/ernie/web/GraphDataServlet.java index 11800d7..b574e1c 100644 --- a/src/org/torproject/ernie/web/GraphDataServlet.java +++ b/src/org/torproject/ernie/web/GraphDataServlet.java @@ -64,6 +64,8 @@ public class GraphDataServlet extends HttpServlet { this.availableGraphDataFiles.put("relay-dir-bandwidth", "dirbytes"); this.availableGraphDataFiles.put("relay-bandwidth-history-by-flags", "bwhist-flags"); + this.availableGraphDataFiles.put("relay-bandwidth-by-flags", + "bandwidth-flags"); this.availableGraphDataFiles.put("direct-users-by-country", "direct-users"); this.availableGraphDataFiles.put("bridge-users-by-country", diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index d8517c1..e4e08bc 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -54,6 +54,7 @@ public class RObjectGenerator implements ServletContextListener { /* Initialize map of available CSV files. */ this.availableCsvFiles = new TreeSet<String>(); this.availableCsvFiles.add("bandwidth"); + this.availableCsvFiles.add("bandwidth-flags"); this.availableCsvFiles.add("bridge-users"); this.availableCsvFiles.add("bwhist-flags"); this.availableCsvFiles.add("connbidirect"); @@ -88,6 +89,7 @@ public class RObjectGenerator implements ServletContextListener { this.availableGraphs.put("versions", "start,end,filename,dpi"); this.availableGraphs.put("platforms", "start,end,filename,dpi"); this.availableGraphs.put("bandwidth", "start,end,filename,dpi"); + this.availableGraphs.put("bandwidth-flags", "start,end,filename,dpi"); this.availableGraphs.put("bwhist-flags", "start,end,filename,dpi"); this.availableGraphs.put("dirbytes", "start,end,filename,dpi"); this.availableGraphs.put("direct-users", diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 04fffef..d73f672 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -303,6 +303,41 @@ Exit and/or Guard flags assigned by the directory authorities. <a href="csv/bwhist-flags.csv">CSV</a> file containing all data. +<a name="bandwidth-flags"></a> +<h3><a href="#bandwidth-flags" class="anchor">Advertised bandwidth and +bandwidth history by relay flags</a></h3> + +The following graph shows the advertised bandwidth and bandwidth +history of all relays with the Exit and/or Guard flags assigned by the +directory authorities. +Note that these sets possibly overlap with relays having both Exit and +Guard flag. +<img src="bandwidth-flags.png${bandwidth_flags_url}" + width="576" height="360" alt="Advertised bandwidth and bandwidth history by relay flags graph"> +<form action="network.html#bandwidth-flags"> + <div class="formrow"> + <input type="hidden" name="graph" value="bandwidth-flags"> + + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(bandwidth_flags_start) == 0}">${default_start_date}</c:when><c:otherwise>${bandwidth_flags_start[0]}</c:otherwise></c:choose>"> + <label>End date (yyyy-mm-dd):</label> + <input type="text" name="end" size="10" + value="<c:choose><c:when test="${fn:length(bandwidth_flags_end) == 0}">${default_end_date}</c:when><c:otherwise>${bandwidth_flags_end[0]}</c:otherwise></c:choose>"> + + Resolution: <select name="dpi"> + <option value="72"<c:if test="${bandwidth_flags_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> + <option value="150"<c:if test="${bandwidth_flags_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option> + <option value="300"<c:if test="${bandwidth_flags_dpi[0] eq '300'}"> selected</c:if>>Print high - 2400x1500</option> + </select> + + <input class="submit" type="submit" value="Update graph"> + + </div> +</form> +<a href="csv/bandwidth-flags.csv">CSV</a> file containing all data. + + <a name="dirbytes"></a> <h3><a href="#dirbytes" class="anchor">Number of bytes spent on answering directory requests</a></h3>

1 0

r25775: {website} add two new mirrors. refresh status of all mirrors. (in website/trunk: . include)
by Andrew Lewman 28 Aug '12

28 Aug '12

Author: phobos Date: 2012-08-28 16:20:22 +0000 (Tue, 28 Aug 2012) New Revision: 25775 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add two new mirrors. refresh status of all mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-08-28 00:16:13 UTC (rev 25774) +++ website/trunk/include/mirrors-table.wmi 2012-08-28 16:20:22 UTC (rev 25775) @@ -18,15 +18,15 @@ <tr> - <td>US</td> + <td>EE</td> - <td>Quintex</td> + <td>CyberSIDE</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://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,40 +35,6 @@ <tr> - <td>PT</td> - - <td>5ª Coluna</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - - <td>CCC</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>torproject.is</td> @@ -86,15 +52,15 @@ <tr> - <td>IT</td> + <td>AT</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.jcsh.it/dist/">http</a></td> - <td><a href="http://torproject.jcsh.it/">http</a></td> + <td><a href="http://torproject.ph3x.at/dist/">http</a></td> + <td><a href="http://torproject.ph3x.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,36 +69,36 @@ <tr> - <td>AT</td> + <td>US</td> - <td></td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.ph3x.at/dist/">http</a></td> - <td><a href="http://torproject.ph3x.at/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> <td>US</td> - <td>BarkerJr</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://tor.minibofh.org/dist/">http</a></td> + <td><a href="http://tor.minibofh.org/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -324,40 +290,6 @@ <tr> - <td>US</td> - - <td></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> - </td> - <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> -</tr> - -<tr> - - <td>DE</td> - - <td>factor.cc</td> - - <td>Up to 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></td> @@ -443,23 +375,6 @@ <tr> - <td>DE</td> - - <td>beme it</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> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - <td>US</td> <td>NW Linux</td> @@ -630,23 +545,6 @@ <tr> - <td>DE</td> - - <td>[[:bbs:]]</td> - - <td>Up to 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> - </td> - <td> - </td> -</tr> - -<tr> - <td>INT</td> <td>CoralCDN</td> @@ -681,15 +579,15 @@ <tr> - <td>EE</td> + <td>DK</td> - <td>CyberSIDE</td> + <td>Zentrum der Gesundheit</td> - <td>Up to date</td> + <td>Out of date</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><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> @@ -702,7 +600,7 @@ <td>homosu</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://tor.homosu.net/dist/">http</a></td> @@ -715,19 +613,19 @@ <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>[[:bbs:]]</td> <td>Out of 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.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> @@ -749,15 +647,15 @@ <tr> - <td>DE</td> + <td>IN</td> - <td></td> + <td>India Tor Fans</td> <td>Out of 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><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> @@ -766,15 +664,15 @@ <tr> - <td>IN</td> + <td>DE</td> - <td>India Tor Fans</td> + <td></td> <td>Out of date</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://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> @@ -787,11 +685,11 @@ <td></td> - <td>Out of date</td> + <td>Unknown</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><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> @@ -802,13 +700,64 @@ <td>US</td> + <td>Quintex</td> + + <td>Unknown</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>PT</td> + + <td>5ª Coluna</td> + + <td>Unknown</td> + + <td> - </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> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>CCC</td> + + <td>Unknown</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>IT</td> + <td></td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> + <td><a href="http://torproject.jcsh.it/dist/">http</a></td> + <td><a href="http://torproject.jcsh.it/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -834,6 +783,91 @@ <tr> + <td>UA</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td></td> + + <td>Unknown</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> - </td> + <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> +</tr> + +<tr> + + <td>US</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.loritsu.com/dist/">http</a></td> + <td><a href="http://tor.loritsu.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + + <td>factor.cc</td> + + <td>Unknown</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>DE</td> + + <td>beme it</td> + + <td>Unknown</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> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> +</tr> + +<tr> + <td>NL</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-08-28 00:16:13 UTC (rev 25774) +++ website/trunk/update-mirrors.pl 2012-08-28 16:20:22 UTC (rev 25775) @@ -1016,6 +1016,42 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror072 => { + adminContact => "", + orgName => "", + isoCC => "US", + subRegion => "", + region => "US", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.minibofh.org/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.minibofh.org/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", + }, + mirror073 => { + adminContact => "", + orgName => "", + isoCC => "UA", + subRegion => "", + region => "UA", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://torua.reactor-xg.kiev.ua/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://torua.reactor-xg.kiev.ua/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Aug '12

28 Aug '12

commit 39e4a90948e5c4be09515cde99b287a218e2206f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 28 14:15:18 2012 +0000 Update translations for vidalia_help --- cs/server.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cs/server.po b/cs/server.po index 657ad3e..464031d 100644 --- a/cs/server.po +++ b/cs/server.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-28 13:44+0000\n" +"PO-Revision-Date: 2012-08-28 13:57+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgid "" "mirror the relay directory, make sure the Directory Port is different" " than the Relay port you entered above. Bridge relays must " "mirror the relay directory." -msgstr "Pokud budete chtít hostovat kopii adresáře relayí pro ostatní uživatele na síti, můžete zaškrtnout políčko Zrcadlit adresář relayí. Pokud máte pomalé připojení, toto políčko nezaškrtávejte. Pokud se rozhodnete hostovat kopii adresáře relayí, ujistěte se, že Port Adresáře je jiný než Port Relaye který jste zadali výše. Bridge relay musí hostovat kopii adresáře relayí." +msgstr "Pokud budete chtít zrcadlit kopii adresáře relayí pro ostatní uživatele na síti, můžete zaškrtnout políčko Zrcadlit adresář relayí. Pokud máte pomalé připojení, toto políčko nezaškrtávejte. Pokud se rozhodnete zrcadlit kopii adresáře relayí, ujistěte se, že Port Adresáře je jiný než Port Relaye který jste zadali výše. Bridge relay musí zrcadlit kopii adresáře relayí." #. type: Content of: <html><body> #: en/server.html:71 @@ -146,7 +146,7 @@ msgid "" " average rate is the same as your maximum rate, then Tor will never " "exceed the specified rate. Your maximum rate must always be greater " "than or equal to your average rate." -msgstr "Maximální rychlost je zásoba bytů určená k plnění požadavků v krátkých úsecích, kdy je provoz rychlejší než vámi zadaná průměrná rychlost, ale dlouhodobě je tento průměr udržován. Nízká průměrná rychlost a vysáká maximální rychlost bude udržovat dlouhodobý průměr ale dovolí rychlejší přenos ve špičce, pokud byla rychlost delší dobu pod průměrem. Pkud je vaše průměrná rychlost stejná jako vaše maximální rychlost, Tor ji nikdy nepřekročí. Vaše maximální rychlost musí být vždy větší nebo rovná průměrné rychlosti." +msgstr "Maximální rychlost je zásoba bytů určená k plnění požadavků v krátkých úsecích, kdy je provoz rychlejší než vámi zadaná průměrná rychlost, ale dlouhodobě je tento průměr udržován. Nízká průměrná rychlost a vysoká maximální rychlost bude udržovat dlouhodobý průměr, ale dovolí rychlejší přenos ve špičce, pokud byla rychlost delší dobu pod průměrem. Pokud je vaše průměrná rychlost stejná jako vaše maximální rychlost, Tor ji nikdy nepřekročí. Vaše maximální rychlost musí být vždy větší nebo rovná průměrné rychlosti." #. type: Content of: <html><body> #: en/server.html:96 @@ -156,7 +156,7 @@ msgid "" " per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable " "connection). Tor requires a minimum of 20 kilobytes per second to run a " "relay." -msgstr "Průměrná rychlost je maximální dlouhodobý průměr rychlosti, který bude povolen (v kilobytech za sekundu). Můžete například zvolit 2 megabyty ta sekundu (2048 KB/S) nebo 50 kilobytů za sekundu (středně rychlé kabelové připojení). To potřebuje minimálně 20 kilobytů za sekundu aby mohl provozovat relay." +msgstr "Průměrná rychlost je maximální dlouhodobý průměr rychlosti, který bude povolen (v kilobytech za sekundu). Můžete například zvolit 2 megabyty za sekundu (2048 KB/S) nebo 50 kilobytů za sekundu (středně rychlé kabelové připojení). Tor potřebuje minimálně 20 kilobytů za sekundu, aby mohl provozovat relay." #. type: Content of: <html><body> #: en/server.html:103 @@ -167,7 +167,7 @@ msgid "" "outgoing bytes than incoming. If you find this is the case and is putting " "too much strain on your bandwidth, you should consider unchecking the " "checkbox labeled Mirror the relay directory." -msgstr "Je důležité mít na paměti, že Tor měří rychlosti v bytech, a ne v bitech. Tor také sleduje poze příchozí byty, ne odchozí. Pokud například na svém relayi hostujete kopii adresáře relayí, budete mít více odchozích bytů než příchozích. Pokud je to váš případ a příliš to zatěžuje vaše připojení, měli byste zvážit zda neodškrknout políčko Zrcadlit adresář relayí." +msgstr "Je důležité mít na paměti, že Tor měří rychlosti v bytech, a ne v bitech. Tor také sleduje poze příchozí byty, ne odchozí. Pokud například na svém relayi zrcadlíte kopii adresáře relayí, budete mít více odchozích bytů než příchozích. Pokud je to váš případ a příliš to zatěžuje vaše připojení, měli byste zvážit zda neodškrknout políčko Zrcadlit adresář relayí." #. type: Content of: <html><body> #: en/server.html:111 @@ -187,7 +187,7 @@ msgid "" "Tor uses a default list of exit policies that restrict some services, such " "as mail to prevent spam and some default file sharing ports to reduce abuse " "of the Tor network." -msgstr "Pravdila výstupu vám umožňují určit, které prostředky na internetu budou moci jiní uživatelé používat skze váš Tor relay. Tor používá výchozí seznam pravidel výtupu pro omezení některých služeb, jako je email aby se předešlo spamu, a některé výchozí porty pro sdílení souborů aby nedocházelo ke zneužívání sítě Tor." +msgstr "Pravdila výstupu vám umožňují určit, které prostředky na internetu budou moci jiní uživatelé používat skze váš Tor relay. Tor používá výchozí seznam pravidel výtupu pro omezení některých služeb, jako je email, aby se předešlo spamu, a některé výchozí porty pro sdílení souborů, aby nedocházelo ke zneužívání sítě Tor." #. type: Content of: <html><body> #: en/server.html:121 @@ -198,7 +198,7 @@ msgid "" "resource from your relay. If the box labeled Misc Other Services is " "checked, Tor users will be able to access other services not covered by the " "other checkboxes or Tor's default exit policy." -msgstr "Každé z políček předstuvje typ prostředků který uživatelům Tor umožňíte používat skrze váš relay. Pokud odškrtneté políčko u konkrétního prostředku, uživatelé Toru nebudou moci používat pro přístup k tomuto typu prostředků váš relay. Pokud je políčko Ostatní služby zaškrtnuté budou mít uživatelé Toru přístup k jiným službám které, které nejsou uvedeny v nekterém z políček nebo výchozích pravidlech po výstup v Toru." +msgstr "Každé z políček předstuvje typ prostředků který uživatelům Tor umožňíte používat skrze váš relay. Pokud odškrtneté políčko u konkrétního prostředku, uživatelé Toru nebudou moci používat pro přístup k tomuto typu prostředků váš relay. Pokud je políčko Ostatní služby zaškrtnuté, budou mít uživatelé Toru přístup k jiným službám které, které nejsou uvedeny v nekterém z políček nebo výchozích pravidlech po výstup v Toru." #. type: Content of: <html><body> #: en/server.html:130 @@ -207,12 +207,12 @@ msgid "" "represented by each of the exit policy checkboxes. The Description " "column describes the resources Tor clients will be allowed to access through" " your relay, if the associated box is checked." -msgstr "Pro úplnost, následující tabukla uvásí konkrétní čísla portů která představují jednotlivá políčka pro pravdilavýstupu. Sloupec Popis popisuje prostředky, které budou moci uživatelé Toru používat skrze váš Relay, pokud bude příslušné políčko zaškrtnuté." +msgstr "Pro úplnost, následující tabulka uvádí konkrétní čísla portů, která představují jednotlivá políčka pro pravdila výstupu. Sloupec Popis popisuje prostředky, které budou moci uživatelé Toru používat skrze váš Relay, pokud bude příslušné políčko zaškrtnuté." #. type: Content of: <html><body><table><tr><td> #: en/server.html:138 msgid "Checkbox" -msgstr "Políčkox" +msgstr "Políčko" #. type: Content of: <html><body><table><tr><td> #: en/server.html:139 @@ -313,7 +313,7 @@ msgstr "*" #. type: Content of: <html><body><table><tr><td> #: en/server.html:170 msgid "All other applications that aren't covered by the previous checkboxes" -msgstr "Všechny aplikace, které nejsou v některém z předchozch políček." +msgstr "Všechny aplikace, které nejsou uvedeny v některém z předchozích políček." #. type: Content of: <html><body> #: en/server.html:175 @@ -323,7 +323,7 @@ msgid "" "uncheck all of the checkboxes, your relay is still useful to the Tor " "network. Your relay will allow other Tor users to connect to the Tor " "network and will help relay traffic between other Tor relays." -msgstr "Pokud nechcete jiným uživatelům Toru dovolit vytvářet připojení mimo síť Tor z vašeho relaye, můžete odškrtnout všechna políčka. I když není žádné políčko zaškrtnuté, váš relay je pořád v síti Tor užitečný. Váš relay umožní jiným uživatelům Toru připojit se k síti Tor, a pomůže předávat data mezi jinými Tor relayi." +msgstr "Pokud nechcete jiným uživatelům Toru dovolit vytvářet připojení mimo síť Tor z vašeho relaye, můžete odškrtnout všechna políčka. I když není žádné políčko zaškrtnuté, váš relay je stejně v síti Tor užitečný. Váš relay umožní jiným uživatelům Toru připojit se k síti Tor, a pomůže předávat data mezi jinými Tor relayi." #. type: Content of: <html><body> #: en/server.html:182 @@ -331,7 +331,7 @@ msgid "" "If you chose to run a bridge relay, the Exit Policies tab will be " "grayed out, since bridge relays do not allow exit connections. Bridges are " "only used by Tor clients to connect to the Tor network." -msgstr "Pokud se rozhodnete provozovat cridge relay, záložka pravidla výstupu bude šedá, protože bridge relaye neumožňují výsupní připojení. Fungují jen jako mosty pro Tor kilenty do sítě Tor." +msgstr "Pokud se rozhodnete provozovat bridge relay, záložka pravidla výstupu bude šedá, protože bridge relaye neumožňují výstupní připojení. Fungují jen jako mosty pro Tor kilenty do sítě Tor." #. type: Content of: <html><body> #: en/server.html:188

1 0