- tor-commits - lists.torproject.org

[metrics-tasks/master] Add another log/log graph (#1854).
by karsten＠torproject.org 26 Nov '12

26 Nov '12

commit b3aab7b0745d62c6325fa88efe1ec7c6a5655a22 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 26 15:08:43 2012 -0500 Add another log/log graph (#1854). --- task-1854/plot-entropy.R | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/task-1854/plot-entropy.R b/task-1854/plot-entropy.R index 735e65f..34635e3 100644 --- a/task-1854/plot-entropy.R +++ b/task-1854/plot-entropy.R @@ -17,6 +17,17 @@ scale_y_continuous(name = "") + 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 <- 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)") + +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 <- melt(l, "x")

1 0

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

26 Nov '12

commit 006f95ff3a411a94061f7db77620d3867601204e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 26 19:46:13 2012 +0000 Update translations for torbirdy_completed --- nl/torbirdy.dtd | 2 ++ nl/torbirdy.properties | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index ad5ff83..c7b9d67 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Bij opstarten direct naar de laatst bekeken map gaan [standaard: uitgeschakeld, lokale map wordt geselecteerd]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Gebruik niet de UTC tijdzone voor Thunderbird [standaard: gebruik UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Uitschakelen GPG '--throw-keyids' [standaard: ingeschakeld]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Account-specifiek"> diff --git a/nl/torbirdy.properties b/nl/torbirdy.properties index a731baf..12bafa7 100644 --- a/nl/torbirdy.properties +++ b/nl/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy heeft Thunderbird's automatische configuratiehulp torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de geavanceerde instellingen van TorBirdy wordt AFGERADEN.\n\nGa hier alleen mee verder als u weet wat u doet. torbirdy.email.advanced.nextwarning=Toon deze waarschuwing ook in de toekomst torbirdy.email.advanced.title=TorBirdy geavanceerde instellingen + +torbirdy.restart=Om de tijdzone aanpassing door te voeren, sluit Thunderbird en start het opnieuw.

1 0

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

26 Nov '12

commit 111c1d1229b3619a7b214e0dc5189cbe4990d121 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 26 19:46:06 2012 +0000 Update translations for torbirdy --- nl/torbirdy.dtd | 4 ++-- nl/torbirdy.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index dfd2121..c7b9d67 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -33,8 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Bij opstarten direct naar de laatst bekeken map gaan [standaard: uitgeschakeld, lokale map wordt geselecteerd]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> -<!ENTITY torbirdy.prefs.timezone.label ""> -<!ENTITY torbirdy.prefs.timezone.key ""> +<!ENTITY torbirdy.prefs.timezone.label "Gebruik niet de UTC tijdzone voor Thunderbird [standaard: gebruik UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Uitschakelen GPG '--throw-keyids' [standaard: ingeschakeld]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Account-specifiek"> diff --git a/nl/torbirdy.properties b/nl/torbirdy.properties index a38e199..12bafa7 100644 --- a/nl/torbirdy.properties +++ b/nl/torbirdy.properties @@ -12,4 +12,4 @@ torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de geavanceerd torbirdy.email.advanced.nextwarning=Toon deze waarschuwing ook in de toekomst torbirdy.email.advanced.title=TorBirdy geavanceerde instellingen -# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=Om de tijdzone aanpassing door te voeren, sluit Thunderbird en start het opnieuw.

1 0

r25910: {website} list the new 990 and PC. (website/trunk/about/en)
by Andrew Lewman 26 Nov '12

26 Nov '12

Author: phobos Date: 2012-11-26 16:33:17 +0000 (Mon, 26 Nov 2012) New Revision: 25910 Modified: website/trunk/about/en/financials.wml Log: list the new 990 and PC. Modified: website/trunk/about/en/financials.wml =================================================================== --- website/trunk/about/en/financials.wml 2012-11-26 16:31:32 UTC (rev 25909) +++ website/trunk/about/en/financials.wml 2012-11-26 16:33:17 UTC (rev 25910) @@ -18,6 +18,10 @@ Financial Statements and Audit Report</a></dd> <dd><a href="findoc/2011-TorProject-DCF.pdf">2011 Dept of Commerce Data Collection Form</a></dd> + <dd><a href="findoc/2011-TorProject-Form990.pdf">2011 IRS Form + 990</a></dd> + <dd><a href="findoc/2011-TorProject-FormPC.pdf">2011 State of + MA Form PC</a></dd> <dt>Fiscal Year 2010</dt> <dd><a href="findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf">2010

1 0

r25909: {} publish 2011 Form PC and Form 990. (website/trunk/about/findoc)
by Andrew Lewman 26 Nov '12

26 Nov '12

Author: phobos Date: 2012-11-26 16:31:32 +0000 (Mon, 26 Nov 2012) New Revision: 25909 Added: website/trunk/about/findoc/2011-TorProject-Form990.pdf website/trunk/about/findoc/2011-TorProject-Form990.pdf.asc website/trunk/about/findoc/2011-TorProject-FormPC.pdf website/trunk/about/findoc/2011-TorProject-FormPC.pdf.asc Log: publish 2011 Form PC and Form 990. Added: website/trunk/about/findoc/2011-TorProject-Form990.pdf =================================================================== (Binary files differ) Property changes on: website/trunk/about/findoc/2011-TorProject-Form990.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/about/findoc/2011-TorProject-Form990.pdf.asc =================================================================== --- website/trunk/about/findoc/2011-TorProject-Form990.pdf.asc (rev 0) +++ website/trunk/about/findoc/2011-TorProject-Form990.pdf.asc 2012-11-26 16:31:32 UTC (rev 25909) @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJQs5kAAAoJEGJ97ihrTWR1+PkP/A+zn6cjI6HyP/QXtG/vkVZt +TMS7pZFr82uPvJ57n2YHKHQa/ueg8Zqm8yS9KVKYVlTuok2c/C28TgyVIuXZOu3O +tj6Cc9Vmazn+GZQKJgNLTLTCpP0tk1FzIdlu+RUATM/XSRPBeZNB9vQWsS/fFZX+ +ZiBHvrOcoRzivRtYcz2RXPogLiptH09fvNsw52UNWGGKoa73Rf92zBKK8MH2hCn3 +5UwrhfvMQAesip21hK9TPG68dXcuLVc27qUaXf6MxqNi1N2piKVmD3DCdG97SIuE +/VexsLo28ah2fSQw77pa5PpfOLhGFwZhTD1wzseA0TQD31wgjSd/sL2LtWFMJr5D +DNoAiF0GdjplYwq8zqOC891Blv4CA+ramqWtqSDA5unmcVmWr493lyNZ23CCPiQQ +Rf+BvKbodXf/2nWYG+Jbwn5tq1+eNk9VnuFNNHFaJqoyqvt7bCC9j9KW83WFpKtI +R4V3Bh5HrNPShmdqoshQPYXrdryVc6v4gU1wJCeuzc81jW7lIKR5bvUx2QGnB31U +ksB/awoExHpDWGZ136c/868hg8b57okGsfbowclO8TbuJjN2eyGM8wsPoD7BCgCb +P5nWbDy1FPV5hiTX1yYRbkGxTrmAfe9UkunnIBG8D+/sTKRH4dl89c883lECqNcP +QibK4R9QM4kc/SxaySCk +=Ae5v +-----END PGP SIGNATURE----- Property changes on: website/trunk/about/findoc/2011-TorProject-Form990.pdf.asc ___________________________________________________________________ Added: svn:mime-type + text/plain Added: website/trunk/about/findoc/2011-TorProject-FormPC.pdf =================================================================== (Binary files differ) Property changes on: website/trunk/about/findoc/2011-TorProject-FormPC.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/about/findoc/2011-TorProject-FormPC.pdf.asc =================================================================== --- website/trunk/about/findoc/2011-TorProject-FormPC.pdf.asc (rev 0) +++ website/trunk/about/findoc/2011-TorProject-FormPC.pdf.asc 2012-11-26 16:31:32 UTC (rev 25909) @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJQs5kLAAoJEGJ97ihrTWR1RAsP/3DVctL9DZGDnXJ2arLE75n2 +2V1/ZLFniM+mWBw9y90wA1JbEpa0avSfYPKQseC2Rz2h/Gx9no3V7ZedVl4L3jeP +fSRyvQ4LFkY6bucDF2gpX8mfZVMBRcyDbE4sCMaXqrrvl4CUHbQev7V5VCU9tyir +xwnSfOxM8RfGDhv0P5KjbOBWxypQyTbKPsjAL+NaYu2GbvoZyNgpCU1pnSj9U7AO +sgqKHVoi8VyV+motQQIfheuHLv3J9KWg8PSpLPtjOeq5H6hIj4xXovFdhPYpqlDW +qwpHco7xANyKh79uuQeemJ+2+5CIhQiyNwIR8IA5jIt9/4PjwExuAkb50kR2KC40 +jG90BPPXHE5p9uGkO3Lhco3/0KPElkBFpBpY0s05G+25oUzPJYss99kGa2ZlDllW +Dx1jDAt7MC/mGwi9BA1TifRKWODrpWRIqM8sZZxHjGNDcvEQk29dugrBc8I1ZOi+ +w1YMjqRBbTjSpr99mbGIqgC0UFhraUo4Lr2v4bzP+LUWNEIcYg7Le7Tz4twAJg2N +ln/m2IB9enLa7QIFmIg1ilbzTxtg88XoOz7KZT8+w7A9+pQgdU2gDFmHF7foBcTq +8XiAa7hUJdGkenGYricqq3wWQozDfdC3bBj0rgQjSFMLWhN5GL0qq2zxVNm6jvWq +B2qQF+1tAAcqxZeBgmNB +=92mu +-----END PGP SIGNATURE----- Property changes on: website/trunk/about/findoc/2011-TorProject-FormPC.pdf.asc ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r25908: {website} update the jobs page with the support-translator-position (website/trunk/about/en)
by Runa Sandvik 26 Nov '12

26 Nov '12

Author: runa Date: 2012-11-26 16:13:49 +0000 (Mon, 26 Nov 2012) New Revision: 25908 Modified: website/trunk/about/en/jobs.wml Log: update the jobs page with the support-translator-position Modified: website/trunk/about/en/jobs.wml =================================================================== --- website/trunk/about/en/jobs.wml 2012-11-26 15:04:21 UTC (rev 25907) +++ website/trunk/about/en/jobs.wml 2012-11-26 16:13:49 UTC (rev 25908) @@ -19,6 +19,7 @@ <li><a href="<page about/jobs-projectcoordinator>">Project coordinator</a></li> <li><a href="<page about/jobs-pluggabletransport>">Pluggable transport developer</a></li> <li><a href="<page about/jobs-browserhacker>">Browser hacker</a></li> +<li><a href="<page about/jobs-translatorsupport>">Support assistants and translators</a></li> </ul> <p>In the past (and hopefully again in the future, when we have more

1 0

[metrics-tasks/master] Add graphing code for new linf data (#1854).
by karsten＠torproject.org 26 Nov '12

26 Nov '12

commit eaae6a2bb25b122866e84549faa7c54cba7d53c8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 26 11:09:29 2012 -0500 Add graphing code for new linf data (#1854). --- task-1854/plot-entropy.R | 133 ++++++++++++++++++++++++++++++---------------- task-1854/pyextract.py | 29 ++++++++++ 2 files changed, 116 insertions(+), 46 deletions(-) diff --git a/task-1854/plot-entropy.R b/task-1854/plot-entropy.R index e28193f..735e65f 100644 --- a/task-1854/plot-entropy.R +++ b/task-1854/plot-entropy.R @@ -2,52 +2,93 @@ library(ggplot2) library(reshape) library(scales) -d <- read.csv("entropy.csv", header = FALSE, - col.names = c("validafter", "min_cw", "relays", "all", "max_all", - "exit", "max_exit", "guard", "max_guard", "country", "max_country", - "as", "max_as"), stringsAsFactor = FALSE) -max_validafter <- max(d$validafter) -d <- d[d$validafter == max_validafter, ] - -e <- d[d$min_cw <= 10000, ] -e <- data.frame(min_cw = e$min_cw, all = e$all / e$max_all, - exit = e$exit / e$max_exit, guard = e$guard / e$max_guard, - country = e$country / e$max_country, as = e$as / e$max_as) -e <- melt(e, "min_cw") -e <- data.frame(min_cw = e$min_cw, variable = - ifelse(e$variable == "all", "All relays", - ifelse(e$variable == "exit", "All exits", - ifelse(e$variable == "guard", "All guards", - ifelse(e$variable == "country", "All countries", - "All ASes")))), value = e$value) -ggplot(e, aes(x = min_cw, y = value)) + +e <- read.csv("extracted.csv", header = FALSE, + col.names = c("validafter", "min_adv_bw", "relays", "linf", "graph"), + stringsAsFactor = FALSE) + +l <- e[e$graph == 'last', ] +l <- data.frame(x = l$min_adv_bw, relays = l$relays, 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 = "") + +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 <- 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 = "") + +opts(title = paste("Consensus with valid-after time ", max(e$validafter), + "\n", sep = "")) + +h <- e[e$graph == 'history' & e$min_adv_bw == 10000, ] +h <- data.frame(validafter = h$validafter, relays = h$relays, linf = h$linf) +h <- aggregate(h[, 2:length(h)], by = list(x = as.Date(h$validafter)), FUN = mean) +h <- melt(h, "x") +ggplot(h, aes(x = as.POSIXct(x), y = value)) + +geom_line() + +facet_grid(variable ~ ., scales = "free_y") + +scale_x_datetime(name = "") + +scale_y_continuous(name = "") + +opts(title = "Advertised bandwidth cutoff 10000 B/s\n") + +h <- e[e$graph == 'history' & e$min_adv_bw == 50000, ] +h <- data.frame(validafter = h$validafter, relays = h$relays, linf = h$linf) +h <- aggregate(h[, 2:length(h)], by = list(x = as.Date(h$validafter)), FUN = mean) +h <- melt(h, "x") +ggplot(h, aes(x = as.POSIXct(x), y = value)) + +geom_line() + +facet_grid(variable ~ ., scales = "free_y") + +scale_x_datetime(name = "") + +scale_y_continuous(name = "") + +opts(title = "Advertised bandwidth cutoff 50000 B/s\n") + +h <- e[e$graph == 'history' & e$min_adv_bw == 100000, ] +h <- data.frame(validafter = h$validafter, relays = h$relays, linf = h$linf) +h <- aggregate(h[, 2:length(h)], by = list(x = as.Date(h$validafter)), FUN = mean) +h <- melt(h, "x") +ggplot(h, aes(x = as.POSIXct(x), y = value)) + geom_line() + -facet_wrap(~ variable) + -scale_x_continuous(name = "\nMinimum consensus weight") + -scale_y_continuous(name = "", limits = c(0, 1), labels = percent) + -opts(title = paste("Degree of anonymity based on consensus from ", - max_validafter, "\n", sep = "")) -ggsave("degree-of-anonymity-min-cw.png", width = 8, height = 6, dpi = 100) - -f <- d[d$min_cw <= 10000, ] -f <- rbind( - data.frame(min_cw = f$min_cw, entropy = f$all, max = f$max_all, - type = "All relays"), - data.frame(min_cw = f$min_cw, entropy = f$exit, max = f$max_exit, - type = "All exits"), - data.frame(min_cw = f$min_cw, entropy = f$guard, max = f$max_guard, - type = "All guards"), - data.frame(min_cw = f$min_cw, entropy = f$country, max = f$max_country, - type = "All countries"), - data.frame(min_cw = f$min_cw, entropy = f$as, max = f$max_as, - type = "All ASes")) -f <- melt(f, c("min_cw", "type")) -ggplot(f, aes(x = min_cw, y = value, colour = variable)) + +facet_grid(variable ~ ., scales = "free_y") + +scale_x_datetime(name = "") + +scale_y_continuous(name = "") + +opts(title = "Advertised bandwidth cutoff 100000 B/s\n") + +h <- e[e$graph == 'history' & e$min_adv_bw %in% c(10000, 50000, 100000), ] +h <- data.frame(validafter = h$validafter, min_adv_bw = h$min_adv_bw, relays = h$relays, linf = h$linf) +h <- aggregate(h[, 2:length(h)], + by = list(x = as.Date(h$validafter), min_adv_bw = h$min_adv_bw), FUN = mean) +h <- melt(h, c("x", "min_adv_bw")) +ggplot(h, aes(x = as.POSIXct(x), y = value, colour = as.factor(min_adv_bw))) + +geom_line() + +facet_grid(variable ~ ., scales = "free_y") + +scale_x_datetime(name = "") + +scale_y_continuous(name = "") + +scale_colour_hue(name = "Advertised bandwidth cutoff in B/s") + +opts(legend.position = "bottom") + +h <- e[e$graph == 'history' & e$min_adv_bw == 10000, ] +m10000 <- data.frame(linf = sort(h$linf), + frac_cons = (1:length(h$linf))/length(h$linf), min_adv_bw = "10000") +h <- e[e$graph == 'history' & e$min_adv_bw == 50000, ] +m50000 <- data.frame(linf = sort(h$linf), + frac_cons = (1:length(h$linf))/length(h$linf), min_adv_bw = "50000") +h <- e[e$graph == 'history' & e$min_adv_bw == 100000, ] +m100000 <- data.frame(linf = sort(h$linf), + frac_cons = (1:length(h$linf))/length(h$linf), min_adv_bw = "100000") +h <- rbind(m10000, m50000, m100000) +ggplot(h, aes(x = linf, y = frac_cons, colour = as.factor(min_adv_bw))) + geom_line() + -facet_wrap(~ type) + -scale_x_continuous(name = "\nMinimum consensus weight") + -scale_y_continuous(name = "", limits = c(0, max(f$value))) + -opts(title = paste("Entropy and maximum entropy based on consensus from ", - max_validafter, "\n", sep = ""), legend.position = "none") -ggsave("entropy-min-cw.png", width = 8, height = 6, dpi = 100) +scale_x_continuous(name = "") + +scale_y_continuous( + name = "Fraction of consensuses from 2011-11-01 to 2012-10-31\n") + +scale_colour_hue(name = "Advertised bandwidth cutoff in B/s") + +opts(legend.position = "bottom") diff --git a/task-1854/pyextract.py b/task-1854/pyextract.py new file mode 100644 index 0000000..4220a2a --- /dev/null +++ b/task-1854/pyextract.py @@ -0,0 +1,29 @@ +import os +import sys + +def main(): + out_file = open('extracted.csv', 'w') + last_validafter = '' + last_lines = [] + for line in open('entropy.csv'): + parts = line.strip().split(',') + validafter = parts[0] + min_adv_bw = int(parts[1]) + relays = parts[2] + linf = parts[3] + if last_validafter != validafter: + last_lines = [] + next_cutoffs = [0, 10000, 20000, 30000, 40000, 50000, 75000, + 100000, 100000000000000000000] + while min_adv_bw >= next_cutoffs[0]: + out_file.write("%s,%d,%s,%s,history\n" % (validafter, + next_cutoffs[0], relays, linf, )) + next_cutoffs.pop(0) + last_lines.append(line.strip()) + last_validafter = validafter + for line in last_lines: + out_file.write(line + ",last\n") + +if __name__ == '__main__': + main() +

1 0

r25907: {website} update the instructions for claiming t-shirts. (website/trunk/getinvolved/en)
by Andrew Lewman 26 Nov '12

26 Nov '12

Author: phobos Date: 2012-11-26 15:04:21 +0000 (Mon, 26 Nov 2012) New Revision: 25907 Modified: website/trunk/getinvolved/en/tshirt.wml Log: update the instructions for claiming t-shirts. Modified: website/trunk/getinvolved/en/tshirt.wml =================================================================== --- website/trunk/getinvolved/en/tshirt.wml 2012-11-25 23:22:26 UTC (rev 25906) +++ website/trunk/getinvolved/en/tshirt.wml 2012-11-26 15:04:21 UTC (rev 25907) @@ -9,16 +9,16 @@ <a href="<page getinvolved/volunteer>">Get Involved » </a> <a href="<page getinvolved/tshirt>">Tshirt</a> </div> - <div id="maincol"> + <div id="maincol"> <h1>Tor: T-shirt for Contributing</h1> <hr> - + <p>You can get one of these fine Tor T-shirts for contributing to the Tor project. There are three primary ways of contributing:</p> - + <ol> - <li>A large enough ($65+) <a href="<page donate/donate>">donation</a> to the Tor - Project.</li> + <li>A large enough ($65+) <a href="<page + donate/donate>">donation</a> to the Tor Project.</li> <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a> that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 100 KB/s traffic, or if you're @@ -32,21 +32,20 @@ or establish yourself as a Tor advocate. </li> </ol> - + <p> - If you qualify, send mail to donations at torproject dot org with - a brief explanation. Be sure to specify a color preference, a size - (S/M/L/XL/XXL), a backup size if your first choice isn't available, - and a shipping address. + If you qualify, send mail to donations(a)torproject.org with + a brief explanation. You will receive a unique, one-time use code + to claim your t-shirt. </p> - + <p> You can choose between the traditional black and our conversation-starting bright green. You can also see the shirts <a href="<wiki>doc/TorShirt">in action</a> — add your own photos there too. </p> - + <div style="text-align: center"> <a href="$(IMGROOT)/black-tor-tshirt.png"><img src="$(IMGROOT)/black-tor-tshirt.png"></a> @@ -62,4 +61,4 @@  </div>  -#include <foot.wmi> +#include <foot.wmi>

1 0

[ooni-probe/master] Add logPrefixes to txagentwithsocks
by art＠torproject.org 26 Nov '12

26 Nov '12

commit 4b1c96d43520b2fd6df72e7e4845c879677d4c63 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 26 13:15:02 2012 +0100 Add logPrefixes to txagentwithsocks * Improve http test template --- ooni/templates/httpt.py | 9 +++++---- ooni/utils/txagentwithsocks.py | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 2a368a0..480d011 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -66,6 +66,7 @@ class HTTPTest(NetTestCase): self.control_agent = Agent(reactor, sockshost="127.0.0.1", socksport=config.advanced.tor_socksport) + self.report['socksproxy'] = None sockshost, socksport = (None, None) if self.localOptions['socksproxy']: try: @@ -100,7 +101,7 @@ class HTTPTest(NetTestCase): def processInputs(self): pass - def addToReport(self, request, response=None): + def addToReport(self, request, response=None, response_body=None): """ Adds to the report the specified request and response. @@ -125,12 +126,12 @@ class HTTPTest(NetTestCase): 'headers': list(response.headers.getAllRawHeaders()), 'body': response_body, 'code': response.code - } + } self.report['requests'].append(request_response) def _processResponseBody(self, response_body, request, response, body_processor): log.debug("Processing response body") - self.addToReport(request, response) + self.addToReport(request, response, response_body) if body_processor: body_processor(response_body) else: @@ -200,10 +201,10 @@ class HTTPTest(NetTestCase): """ if not response: log.err("Got no response for request %s" % request) + self.addToReport(request, response) return else: log.debug("Got response %s" % response) - return if str(response.code).startswith('3'): self.processRedirect(response.headers.getRawHeaders('Location')[0]) diff --git a/ooni/utils/txagentwithsocks.py b/ooni/utils/txagentwithsocks.py index 49e5a3c..ffaa733 100644 --- a/ooni/utils/txagentwithsocks.py +++ b/ooni/utils/txagentwithsocks.py @@ -32,6 +32,9 @@ class SOCKSv5ClientProtocol(_WrappingProtocol): self._port = port self.ready = False + def logPrefix(self): + return 'SOCKSv5ClientProtocol' + def socks_state_0(self, data): # error state self._connectedDeferred.errback(SOCKSError(0x00)) @@ -90,6 +93,9 @@ class SOCKSv5ClientFactory(_WrappingFactory): _WrappingFactory.__init__(self, wrappedFactory) self._host, self._port = host, port + def logPrefix(self): + return 'SOCKSv5ClientFactory' + def buildProtocol(self, addr): try: proto = self._wrappedFactory.buildProtocol(addr) @@ -113,6 +119,9 @@ class SOCKS5ClientEndpoint(object): self._timeout = timeout self._bindAddress = bindAddress + def logPrefix(self): + return 'SOCKSv5ClientEndpoint' + def connect(self, protocolFactory): try: wf = SOCKSv5ClientFactory(protocolFactory, self._host, self._port) @@ -123,6 +132,7 @@ class SOCKS5ClientEndpoint(object): except: return defer.fail() + class TrueHeaders(http_headers.Headers): def __init__(self, rawHeaders=None): self._rawHeaders = dict() @@ -183,6 +193,9 @@ class TrueHeaders(http_headers.Headers): return default class HTTPClientParser(_newclient.HTTPClientParser): + def logPrefix(self): + return 'HTTPClientParser' + def connectionMade(self): self.headers = TrueHeaders() self.connHeaders = TrueHeaders() @@ -196,7 +209,6 @@ class HTTPClientParser(_newclient.HTTPClientParser): headers = self.headers headers.addRawHeader(name, value) - class HTTP11ClientProtocol(_newclient.HTTP11ClientProtocol): def request(self, request): if self._state != 'QUIESCENT': @@ -261,6 +273,9 @@ class Agent(client.Agent): self._sockshost = sockshost self._socksport = socksport + def logPrefix(self): + return 'SOCKSAgent' + def request(self, method, uri, headers=None, bodyProducer=None): if (uri.startswith('shttp') or uri.startswith('httpo')) and not HTTPConnectionPool: log.err("Requests over SOCKS are supported only with versions of Twisted >= 12.1.0") @@ -297,7 +312,6 @@ class Agent(client.Agent): parsedURI.host, parsedURI.port)) d = self._pool.getConnection(key, endpoint) - print headers._rawHeaders def cbConnected(proto): return proto.request( Request(method, requestPath, headers, bodyProducer,

1 0

[ooni-probe/master] Handle responseNeverReceived failure
by art＠torproject.org 26 Nov '12

26 Nov '12

commit 62d50ea8a826c2da3fbd17d7d184b5540a001239 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 26 12:25:42 2012 +0100 Handle responseNeverReceived failure --- ooni/templates/httpt.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 0d53ebe..2a368a0 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -14,7 +14,7 @@ from twisted.internet.ssl import ClientContextFactory from twisted.internet import reactor from twisted.internet.error import ConnectionRefusedError, DNSLookupError, TCPTimedOutError -from twisted.web._newclient import Request, Response +from twisted.web._newclient import Request, Response, ResponseNeverReceived from ooni.nettest import NetTestCase from ooni.utils import log @@ -309,8 +309,12 @@ class HTTPTest(NetTestCase): self.report['failure'] = 'dns_lookup_error' elif isinstance(failure.value, TCPTimedOutError): - log.err("DNS lookup failure") + 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' return d = agent.request(request['method'], request['url'], headers,

1 0