- tor-commits - lists.torproject.org

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 03 Aug '12

03 Aug '12

commit 3714e62efa8b27a965575844b30f344527ad6f35 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 3 05:15:22 2012 +0000 Update translations for vidalia_installer --- zh_TW/vidalia_zh_TW.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_TW/vidalia_zh_TW.po b/zh_TW/vidalia_zh_TW.po index 582ed86..81db57d 100644 --- a/zh_TW/vidalia_zh_TW.po +++ b/zh_TW/vidalia_zh_TW.po @@ -1,5 +1,6 @@ # # Translators: +# <r2qokk(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # tylerlin <msn(a)tylerlin.com>, 2011. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2012-02-14 09:47+0000\n" -"Last-Translator: tylerlin <msn(a)tylerlin.com>\n" +"PO-Revision-Date: 2012-08-03 05:07+0000\n" +"Last-Translator: r2qo <r2qokk(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgid "" "If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n" "\n" "$_CLICK" -msgstr "" +msgstr "本安裝將會引導您進行 Tor 、 Vidalia 、 Polipo ，及 Torbutton 的安裝。" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"

1 0

r25741: {} first draft of the project coordinator position we'll announ (website/trunk/about/en)
by Andrew Lewman 03 Aug '12

03 Aug '12

Author: phobos Date: 2012-08-03 00:47:08 +0000 (Fri, 03 Aug 2012) New Revision: 25741 Added: website/trunk/about/en/jobs-projectcoordinator.wml Log: first draft of the project coordinator position we'll announce in a month or so. Added: website/trunk/about/en/jobs-projectcoordinator.wml =================================================================== --- website/trunk/about/en/jobs-projectcoordinator.wml (rev 0) +++ website/trunk/about/en/jobs-projectcoordinator.wml 2012-08-03 00:47:08 UTC (rev 25741) @@ -0,0 +1,121 @@ +## translation metadata +# Revision: $Revision: 25666 $ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Jobs (browser hacker)" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page about/overview>">About » </a> + <a href="<page about/jobs>">Jobs</a> + </div> + <div id="maincol"> +<h1>The Tor Project is looking for a Project Coordinator!</h1> + +<p> +A project coordinator is the person who coordinates and helps track +deliverables, progress, and provide metrics on past and current +performance of projects. +</p> + +<p>Your impact will involve:</p> + +<ul> +<li>Deriving deliverables, deadlines, and milestones for each active +contract.</li> +<li>Developing timelines and schedules for completion of milestones and + deliverables for each active, and occassionally proposed, contract.<li> +<li>Collecting ideas and potential deliverables for the future.</li> +<li>Raising concerns, timeline slips, and probability of missed deadlines +to management.</li> +<li>Helping with managing people's schedules, work load, and keep various +people or teams in communication with one another.</li> +<li>Tracking deliverable completion.</li> +<li>Developing and maintaining metrics about project completion rate +and other measures as based on <a +href="http://www.joelonsoftware.com/items/2007/10/26.html">evidence-based +project management</a>.</li> +<li>Helping contractors develop their contract deliverables for six month +periods based on expected workload.</li> +<li>Maintaining project status pages on trac (or whatever system we have) +with deliverables, tickets, and monthly summaries of progress.</li> +<li>Helping to write the monthly progress reports required for contracts.</li> +</ul> + +<p>In general, you should be:</p> +<ul> +<li>Be comfortable and experienced justifying and documenting technical +decisions for a public, world-wide technical audience.</li> +<li>Be comfortable working remotely.</li> +<li>Be comfortable and experienced with interacting with users and other +developers online.</li> +<li>Be comfortable with transparency: as a non-profit, everything we do is in +public, including your name (or at least your business name) and pay +rate.</li> +</ul> + +<p>An ideal candidate would also:</p> + +<ul> +<li>Have experience with open-source software development, including +working with distributed teams across different time-zones containing +employees and volunteers of differing skill levels over multiple mediums, +including email, instant messaging, and IRC.</li> +<li>Have basic familiarity with distributed version control systems.</li> +</ul> + +<p>Other notes:</p> + +<ul> +<li>Tor has an office in Walpole, MA. However, you can work from +wherever you want, in basically any country. You'll need to be +comfortable in this environment! We coordinate via IRC, Instant +Messaging, email, phone and video chats, and bug trackers.</li> +<li>Academic degrees are great, but not required if you have +the right experience.</li> +<li>We only write free and open source software, and we don't +believe in software patents.</li> +</ul> + +<p> +How to apply: +</p> + +<ul> + <li>Link to a sample of projects you've coordinated in the past that + you're allowed to show us.</li> + <li>Provide a CV explaining your background, experience, skills, + and other relevant qualifications.</li> + <li>List some people who can tell us more about you: these + references could be employers or coworkers, open source projects, + etc.</li> + <li>Email the above to jobs(a)torproject.org, specifying the + "Project Coordinator" position.</li> +</ul> + +<p> +About the company:<br> + The Tor Project is a US 501(c)(3) non-profit dedicated to research, + development, and education about online anonymity and privacy. The Tor + network's 3000 volunteer relays carry 14 Gbps for upwards of half a + million daily users, including ordinary citizens who want protection + from identity theft and prying corporations, corporations who want + to look at a competitor's website in private, people around the world + whose Internet connections are censored, and even governments and law + enforcement. Tor has a staff of 15 paid developers, researchers, and + advocates, plus many dozen volunteers who help out on a daily basis. Tor + is funded in part by government research and development grants, and + in part by individual and corporate donations. +</p> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> + Property changes on: website/trunk/about/en/jobs-projectcoordinator.wml ___________________________________________________________________ Added: svn:mime-type + text/vnd.wap.wml

1 0

[torbrowser/master] Add missing include for MacOS.
by mikeperry＠torproject.org 02 Aug '12

02 Aug '12

commit e0f7cf921b0825e21ce31560038d5257afcc8e51 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 2 16:28:59 2012 -0700 Add missing include for MacOS. --- ...solate-the-Image-Cache-per-url-bar-domain.patch | 32 ++++++++++++-------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch index 2478af8..b21536c 100644 --- a/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From 0b3b4970954c9dd7d85929491b887e45abe9c194 Mon Sep 17 00:00:00 2001 +From 1b18f231fce26c0b6d3c2bb2c6e30e30c8e05a1e Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon, 30 Jul 2012 18:37:36 -0700 Subject: [PATCH 21/21] Isolate the Image Cache per url bar domain. @@ -12,7 +12,7 @@ for a channel or nsIDocument. embedding/browser/webBrowser/nsContextMenuInfo.cpp | 29 ++- extensions/cookie/nsCookiePermission.cpp | 3 + image/public/imgILoader.idl | 4 +- - image/src/imgLoader.cpp | 202 ++++++++++++-------- + image/src/imgLoader.cpp | 200 ++++++++++++-------- image/src/imgLoader.h | 13 +- image/src/imgRequest.cpp | 9 +- image/src/imgRequest.h | 3 + @@ -20,19 +20,18 @@ for a channel or nsIDocument. netwerk/base/public/mozIThirdPartyUtil.idl | 21 ++ netwerk/cookie/nsICookiePermission.idl | 1 + toolkit/system/gnome/nsAlertsIconListener.cpp | 3 +- - widget/cocoa/nsMenuItemIconX.mm | 8 +- - 15 files changed, 272 insertions(+), 102 deletions(-) + widget/cocoa/nsMenuItemIconX.mm | 9 +- + 15 files changed, 272 insertions(+), 101 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp -index 6a415e9..abf2eed 100644 +index 6a415e9..62333f3 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp -@@ -39,7 +39,10 @@ - #include "nsNetUtil.h" +@@ -40,6 +40,9 @@ #include "nsIServiceManager.h" #include "nsIHttpChannelInternal.h" -+#include "nsICookiePermission.h" #include "nsIDOMWindow.h" ++#include "nsICookiePermission.h" +#include "nsIDOMDocument.h" +#include "nsIDocument.h" #include "nsILoadContext.h" @@ -249,7 +248,7 @@ index 611b939..db9320b 100644 in nsIPrincipal aLoadingPrincipal, in nsILoadGroup aLoadGroup, diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp -index 36c8e6a..8ed12dc 100644 +index 36c8e6a..dd16771 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -92,6 +92,7 @@ @@ -636,12 +635,11 @@ index 36c8e6a..8ed12dc 100644 // Look in the cache for our URI, and then validate it. // XXX For now ignore aCacheKey. We will need it in the future // for correctly dealing with image load requests that are a result -- // of post data. + // of post data. - imgCacheTable &cache = GetCache(uri); - nsCAutoString spec; - - uri->GetSpec(spec); -+ // of post data if (cache.Get(spec, getter_AddRefs(entry)) && entry) { // We don't want to kick off another network load. So we ask @@ -879,10 +877,18 @@ index 250e4fb..614e70f 100644 nsnull, getter_AddRefs(mIconRequest)); } diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm -index 9505ea2..8739c67 100644 +index 9505ea2..bc9b856 100644 --- a/widget/cocoa/nsMenuItemIconX.mm +++ b/widget/cocoa/nsMenuItemIconX.mm -@@ -338,9 +338,15 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) +@@ -63,6 +63,7 @@ + #include "gfxImageSurface.h" + #include "imgIContainer.h" + #include "nsCocoaUtils.h" ++#include "mozIThirdPartyUtil.h" + + static const PRUint32 kIconWidth = 16; + static const PRUint32 kIconHeight = 16; +@@ -338,9 +339,15 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) [mNativeMenuItem setImage:sPlaceholderIconImage]; }

1 0

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

02 Aug '12

commit fdae985c88bee3d2eff2f91a5686519aa7a9667b Merge: 9e6ba63 e0f7cf9 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 2 16:29:24 2012 -0700 Merge branch 'maint-2.3' ...solate-the-Image-Cache-per-url-bar-domain.patch | 32 ++++++++++++-------- 1 files changed, 19 insertions(+), 13 deletions(-)

1 0

[torbrowser/maint-2.3] Add missing include for MacOS.
by mikeperry＠torproject.org 02 Aug '12

02 Aug '12

commit e0f7cf921b0825e21ce31560038d5257afcc8e51 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 2 16:28:59 2012 -0700 Add missing include for MacOS. --- ...solate-the-Image-Cache-per-url-bar-domain.patch | 32 ++++++++++++-------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch index 2478af8..b21536c 100644 --- a/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From 0b3b4970954c9dd7d85929491b887e45abe9c194 Mon Sep 17 00:00:00 2001 +From 1b18f231fce26c0b6d3c2bb2c6e30e30c8e05a1e Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon, 30 Jul 2012 18:37:36 -0700 Subject: [PATCH 21/21] Isolate the Image Cache per url bar domain. @@ -12,7 +12,7 @@ for a channel or nsIDocument. embedding/browser/webBrowser/nsContextMenuInfo.cpp | 29 ++- extensions/cookie/nsCookiePermission.cpp | 3 + image/public/imgILoader.idl | 4 +- - image/src/imgLoader.cpp | 202 ++++++++++++-------- + image/src/imgLoader.cpp | 200 ++++++++++++-------- image/src/imgLoader.h | 13 +- image/src/imgRequest.cpp | 9 +- image/src/imgRequest.h | 3 + @@ -20,19 +20,18 @@ for a channel or nsIDocument. netwerk/base/public/mozIThirdPartyUtil.idl | 21 ++ netwerk/cookie/nsICookiePermission.idl | 1 + toolkit/system/gnome/nsAlertsIconListener.cpp | 3 +- - widget/cocoa/nsMenuItemIconX.mm | 8 +- - 15 files changed, 272 insertions(+), 102 deletions(-) + widget/cocoa/nsMenuItemIconX.mm | 9 +- + 15 files changed, 272 insertions(+), 101 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp -index 6a415e9..abf2eed 100644 +index 6a415e9..62333f3 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp -@@ -39,7 +39,10 @@ - #include "nsNetUtil.h" +@@ -40,6 +40,9 @@ #include "nsIServiceManager.h" #include "nsIHttpChannelInternal.h" -+#include "nsICookiePermission.h" #include "nsIDOMWindow.h" ++#include "nsICookiePermission.h" +#include "nsIDOMDocument.h" +#include "nsIDocument.h" #include "nsILoadContext.h" @@ -249,7 +248,7 @@ index 611b939..db9320b 100644 in nsIPrincipal aLoadingPrincipal, in nsILoadGroup aLoadGroup, diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp -index 36c8e6a..8ed12dc 100644 +index 36c8e6a..dd16771 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -92,6 +92,7 @@ @@ -636,12 +635,11 @@ index 36c8e6a..8ed12dc 100644 // Look in the cache for our URI, and then validate it. // XXX For now ignore aCacheKey. We will need it in the future // for correctly dealing with image load requests that are a result -- // of post data. + // of post data. - imgCacheTable &cache = GetCache(uri); - nsCAutoString spec; - - uri->GetSpec(spec); -+ // of post data if (cache.Get(spec, getter_AddRefs(entry)) && entry) { // We don't want to kick off another network load. So we ask @@ -879,10 +877,18 @@ index 250e4fb..614e70f 100644 nsnull, getter_AddRefs(mIconRequest)); } diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm -index 9505ea2..8739c67 100644 +index 9505ea2..bc9b856 100644 --- a/widget/cocoa/nsMenuItemIconX.mm +++ b/widget/cocoa/nsMenuItemIconX.mm -@@ -338,9 +338,15 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) +@@ -63,6 +63,7 @@ + #include "gfxImageSurface.h" + #include "imgIContainer.h" + #include "nsCocoaUtils.h" ++#include "mozIThirdPartyUtil.h" + + static const PRUint32 kIconWidth = 16; + static const PRUint32 kIconHeight = 16; +@@ -338,9 +339,15 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) [mNativeMenuItem setImage:sPlaceholderIconImage]; }

1 0

[tor/master] Removed redundant check_sockaddr_family_match call
by nickm＠torproject.org 02 Aug '12

02 Aug '12

commit d91bbf376c75fa339d6da278ff90d60eadc57a11 Author: Matthew Finkel <matthew.finkel(a)gmail.com> Date: Thu Aug 2 15:13:34 2012 -0400 Removed redundant check_sockaddr_family_match call --- src/or/connection.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 777162c..b886a0e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1203,11 +1203,6 @@ connection_handle_listener_read(connection_t *conn, int new_type) return 0; } - if (check_sockaddr_family_match(remote->sa_family, conn) < 0) { - tor_close_socket(news); - return 0; - } - tor_addr_from_sockaddr(&addr, remote, &port); /* process entrance policies here, before we even create the connection */

1 0

[tor/master] Constify struct sockaddr *sa parameter for check
by nickm＠torproject.org 02 Aug '12

02 Aug '12

commit a47e4343dec68b9d89de16f08477c41b43056361 Author: Matthew Finkel <matthew.finkel(a)gmail.com> Date: Thu Aug 2 15:29:38 2012 -0400 Constify struct sockaddr *sa parameter for check The values are only being checked, not modified. --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 777162c..56cec9d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1090,7 +1090,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, * nmap does). We want to detect that, and not go on with the connection. */ static int -check_sockaddr(struct sockaddr *sa, int len, int level) +check_sockaddr(const struct sockaddr *sa, int len, int level) { int ok = 1;

1 0

[tor/master] Merge remote-tracking branch 'sysrqb/bug6518'
by nickm＠torproject.org 02 Aug '12

02 Aug '12

commit 65d8448209633cb5f8f7804c309f537e8ac4b803 Merge: d91bbf3 a47e434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 15:45:10 2012 -0400 Merge remote-tracking branch 'sysrqb/bug6518' src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[metrics-tasks/master] Graphing code for fast exits graphs (#6498).
by karsten＠torproject.org 02 Aug '12

02 Aug '12

commit 80c885ec4b89986374c699939ff9611cbfebc07e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 2 19:04:02 2012 +0200 Graphing code for fast exits graphs (#6498). --- task-6498/.gitignore | 2 + task-6498/plot.R | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/task-6498/.gitignore b/task-6498/.gitignore index 9dc71c8..707150a 100644 --- a/task-6498/.gitignore +++ b/task-6498/.gitignore @@ -4,4 +4,6 @@ lib/ bin/ in/ results.csv +Rplots.pdf +*.png diff --git a/task-6498/plot.R b/task-6498/plot.R new file mode 100644 index 0000000..9f7763d --- /dev/null +++ b/task-6498/plot.R @@ -0,0 +1,77 @@ +# uncomment for 2+ years +#CUTOFF <- "2010-05-26" +#DETAIL <- "week" +CUTOFF <- "2012-06-02" +DETAIL <- "day" + +require(ggplot2) +require(reshape) +require(RColorBrewer) +data <- read.csv("results.csv", stringsAsFactors = FALSE) +data <- data[data$valid_after >= paste(CUTOFF, "00:00:00"), ] + +r <- data +r <- r[r$min_rate == 11875 & r$ports == "80-443-554-1755" & + r$min_advbw == 5000, ] +r <- aggregate(list(relays = r$relays, P_exit = 100 * r$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(r$valid_after), DETAIL))), + FUN = median) +r <- melt(r, id.vars = c("date")) +r <- data.frame(r, type = ifelse(r$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) +ggplot(r, aes(x = date, y = value)) + +geom_line(colour = "purple", size = 0.75) + +facet_grid(type ~ ., scales = "free_y") + +scale_x_date(name = "") + +scale_y_continuous(name = "") + +scale_colour_manual(values = c("purple", "orange")) + +opts(title = paste("Fast relays (95+ Mbit/s configured bandwidth rate,\n", + "5000+ KB/s advertised bandwidth capacity,\n", + "exit to ports 80, 443, 554, and 1755,\n", + "at most 2 relays per /24 network)\n", sep = "")) +ggsave("fast-exits.png", width = 8, height = 6, dpi = 100) + +s <- data +s <- s[s$min_rate == 11875 & s$ports == "80-443-554-1755", ] +s <- aggregate(list(relays = s$relays, P_exit = 100 * s$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(s$valid_after), DETAIL)), + min_advbw = s$min_advbw), FUN = median) +s <- melt(s, id.vars = c("date", "min_advbw")) +s <- data.frame(s, type = ifelse(s$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) +ggplot(s, aes(x = date, y = value, colour = as.factor(min_advbw))) + +geom_line() + +facet_grid(type ~ ., scales = "free_y") + +scale_x_date(name = "") + +scale_y_continuous(name = "") + +scale_colour_manual(name = "Advertised bandwidth (in KB/s)", + values = brewer.pal(6, "Purples")[2:6]) + +opts(title = paste("Relays meeting the fast-exit requirements\nwith", + "varying minimum advertised bandwidth capacities"), + legend.position = "top") +ggsave("advertised-bandwidths-requirement.png", width = 8, height = 6, + dpi = 100) + +t <- data +t1 <- t[t$min_rate == 11875 & t$ports == "80-443-554-1755" & + t$min_advbw == 5000, ] +t2 <- t[t$min_rate == 10000 & t$ports == "80-443" & + t$min_advbw == 2000, ] +t <- rbind(data.frame(t1, var = "95+ Mbit/s, 5000+ KB/s, 80/443/554/1755"), + data.frame(t2, var = "80+ Mbit/s, 2000+ KB/s, 80/443")) +t <- aggregate(list(relays = t$relays, P_exit = 100 * t$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(t$valid_after), DETAIL)), + var = t$var), FUN = median) +t <- melt(t, id.vars = c("date", "var")) +t <- data.frame(t, type = ifelse(t$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) +ggplot(t, aes(x = date, y = value, colour = var)) + +geom_line(size = 0.75) + +facet_grid(type ~ ., scales = "free_y") + +scale_x_date(name = "") + +scale_y_continuous(name = "") + +scale_colour_manual(name = "", values = c("purple", "orange")) + +opts(title = "Relays almost meeting the fast-exit requirements", + legend.position = "top") +ggsave("almost-fast-exits.png", width = 8, height = 6, dpi = 100) +

1 0

[metrics-tasks/master] Extract data for fast exits graphs (#6498).
by karsten＠torproject.org 02 Aug '12

02 Aug '12

commit 48886a04dfa052caaa2b9337ff45b95ebb12747f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 2 14:50:52 2012 +0200 Extract data for fast exits graphs (#6498). --- task-6498/.gitignore | 7 + task-6498/download.sh | 4 + task-6498/run.sh | 3 + task-6498/src/Main.java | 279 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 293 insertions(+), 0 deletions(-) diff --git a/task-6498/.gitignore b/task-6498/.gitignore new file mode 100644 index 0000000..9dc71c8 --- /dev/null +++ b/task-6498/.gitignore @@ -0,0 +1,7 @@ +.classpath +.project +lib/ +bin/ +in/ +results.csv + diff --git a/task-6498/download.sh b/task-6498/download.sh new file mode 100755 index 0000000..b6cb15d --- /dev/null +++ b/task-6498/download.sh @@ -0,0 +1,4 @@ +#!/bin/bash +rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/consensuses in +rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/server-descriptors in + diff --git a/task-6498/run.sh b/task-6498/run.sh new file mode 100755 index 0000000..8621cfd --- /dev/null +++ b/task-6498/run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +javac -d bin/ -cp lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar src/Main.java && java -Xmx2g -cp bin/:lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar Main + diff --git a/task-6498/src/Main.java b/task-6498/src/Main.java new file mode 100644 index 0000000..2a59a13 --- /dev/null +++ b/task-6498/src/Main.java @@ -0,0 +1,279 @@ +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeSet; + +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorFile; +import org.torproject.descriptor.DescriptorReader; +import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.NetworkStatusEntry; +import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.descriptor.ServerDescriptor; + +public class Main { + public static void main(String[] args) throws IOException { + + /* Parse server descriptors in in/server-descriptors/, not keeping a + * parse history, and memorize bandwidth rate, burst, and observed + * bandwidth for every server descriptor. */ + System.out.print(new Date() + ": Parsing server descriptors"); + int parsedServerDescriptors = 0; + DescriptorReader descriptorReader = + DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addDirectory(new File("in/server-descriptors")); + Iterator<DescriptorFile> descriptorFiles = + descriptorReader.readDescriptors(); + Map<String, int[]> serverDescriptors = new HashMap<String, int[]>(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof ServerDescriptor)) { + continue; + } + if (++parsedServerDescriptors >= 1000) { + System.out.print("."); + parsedServerDescriptors = 0; + } + ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; + String digest = serverDescriptor.getServerDescriptorDigest(); + int[] bandwidths = new int[] { + serverDescriptor.getBandwidthRate() / 1024, + serverDescriptor.getBandwidthBurst() / 1024, + serverDescriptor.getBandwidthObserved() / 1024 }; + serverDescriptors.put(digest.toUpperCase(), bandwidths); + } + } + + /* Parse consensuses in in/consensuses/, keeping a parse history. */ + System.out.print("\n" + new Date() + ": Parsing consensuses"); + descriptorReader = DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addDirectory(new File("in/consensuses")); + /* TODO When running this program in a cronjob, add a history file + * using descriptorReader.setExcludeFiles() and set the file writer + * below to append mode instead of overwrite mode. */ + descriptorFiles = descriptorReader.readDescriptors(); + BufferedWriter bw = new BufferedWriter(new FileWriter("results.csv")); + bw.write("valid_after,min_rate,min_advbw,ports,relays,exit_prob\n"); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof RelayNetworkStatusConsensus)) { + continue; + } + RelayNetworkStatusConsensus consensus = + (RelayNetworkStatusConsensus) descriptor; + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + String validAfter = dateTimeFormat.format( + consensus.getValidAfterMillis()); + System.out.print("."); + SortedMap<String, Integer> bandwidthWeights = + consensus.getBandwidthWeights(); + if (bandwidthWeights == null) { + continue; + } + SortedSet<String> weightKeys = new TreeSet<String>(Arrays.asList( + "Wee,Wed".split(","))); + weightKeys.removeAll(bandwidthWeights.keySet()); + if (!weightKeys.isEmpty()) { + continue; + } + double wee = ((double) bandwidthWeights.get("Wee")) / 10000.0, + wed = ((double) bandwidthWeights.get("Wed")) / 10000.0; + SortedSet<String> fingerprints = new TreeSet<String>(); + Map<String, Double> exitWeights = new HashMap<String, Double>(); + double totalExitWeight = 0.0; + Map<String, Integer> bandwidthRates = + new HashMap<String, Integer>(); + Map<String, Integer> advertisedBandwidths = + new HashMap<String, Integer>(); + Map<String, Set<Integer>> exitPorts = + new HashMap<String, Set<Integer>>(); + Map<String, String> addressParts = new HashMap<String, String>(); + for (NetworkStatusEntry relay : + consensus.getStatusEntries().values()) { + String fingerprint = relay.getFingerprint(); + fingerprints.add(fingerprint); + if (!relay.getFlags().contains("Running")) { + continue; + } + boolean isExit = relay.getFlags().contains("Exit") && + !relay.getFlags().contains("BadExit"); + boolean isGuard = relay.getFlags().contains("Guard"); + String serverDescriptorDigest = relay.getDescriptor(). + toUpperCase(); + int[] descriptorBandwidths = serverDescriptors.get( + serverDescriptorDigest); + int bandwidthRate = 0, advertisedBandwidth = 0; + if (descriptorBandwidths != null) { + bandwidthRate = descriptorBandwidths[0]; + advertisedBandwidth = Math.min(Math.min( + descriptorBandwidths[0], + descriptorBandwidths[1]), + descriptorBandwidths[2]); + } + bandwidthRates.put(fingerprint, bandwidthRate); + advertisedBandwidths.put(fingerprint, advertisedBandwidth); + double exitWeight = (double) relay.getBandwidth(); + if (isGuard && isExit) { + exitWeight *= wed; + } else if (isGuard) { + exitWeight = 0.0; + } else if (isExit) { + exitWeight *= wee; + } else { + exitWeight = 0.0; + } + exitWeights.put(fingerprint, exitWeight); + totalExitWeight += exitWeight; + exitPorts.put(fingerprint, new HashSet<Integer>()); + if (relay.getDefaultPolicy() != null && + relay.getPortList() != null) { + boolean acceptPolicy = relay.getDefaultPolicy().equals( + "accept"); + Set<Integer> policyPorts = new HashSet<Integer>(); + List<Integer> relevantPorts = new ArrayList<Integer>(); + relevantPorts.add(80); + relevantPorts.add(443); + relevantPorts.add(554); + relevantPorts.add(1755); + for (String part : relay.getPortList().split(",")) { + int from, to; + if (part.contains("-")) { + from = Integer.parseInt(part.split("-")[0]); + to = Integer.parseInt(part.split("-")[1]); + } else { + from = to = Integer.parseInt(part); + } + while (!relevantPorts.isEmpty() && + from > relevantPorts.get(0)) { + relevantPorts.remove(0); + } + while (!relevantPorts.isEmpty() && + from <= relevantPorts.get(0) && + to >= relevantPorts.get(0)) { + policyPorts.add(relevantPorts.remove(0)); + } + } + for (int port : new int[] { 80, 443, 554, 1755}) { + if (!policyPorts.contains(port) ^ acceptPolicy) { + exitPorts.get(fingerprint).add(port); + } + } + } + String address = relay.getAddress(); + addressParts.put(fingerprint, address.substring(0, + address.lastIndexOf("."))); + } + + /* For the default setting, filter relays which have a bandwidth + * rate >= 11875 KB/s, advertised bandwidth >= 5000 KB/s, and + * which permit exiting to ports 80, 443, 554, and 1755. Only + * consider the fastest 2 relays per /24 with respect to exit + * probability. Also vary requirements. Overall, analyze these + * settings: + * - rate >= 11875, advbw >= 5000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 5000, exit to 80, 443 + * - rate >= 11875, advbw >= 4000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 3000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 2000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 1000, exit to 80, 443, 554, 1755 + * - rate >= 10000, advbw >= 2000, exit to 80, 443 */ + int[] minimumBandwidthRates = new int[] { 11875, 11875, 11875, + 11875, 11875, 11875, 10000 }; + int[] minimumAdvertisedBandwidths = new int[] { 5000, 5000, 4000, + 3000, 2000, 1000, 2000 }; + Set<Integer> defaultPorts = new HashSet<Integer>(); + defaultPorts.add(80); + defaultPorts.add(443); + defaultPorts.add(554); + defaultPorts.add(1755); + Set<Integer> reducedPorts = new HashSet<Integer>(); + reducedPorts.add(80); + reducedPorts.add(443); + List<Set<Integer>> requiredPorts = new ArrayList<Set<Integer>>(); + requiredPorts.add(defaultPorts); + requiredPorts.add(reducedPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(reducedPorts); + for (int i = 0; i < minimumBandwidthRates.length; i++) { + int minimumBandwidthRate = minimumBandwidthRates[i]; + int minimumAdvertisedBandwidth = minimumAdvertisedBandwidths[i]; + Set<Integer> minimumRequiredPorts = requiredPorts.get(i); + Map<String, List<Double>> exitWeightFractionsByAddressParts = + new HashMap<String, List<Double>>(); + for (String fingerprint : fingerprints) { + int bandwidthRate = bandwidthRates.get(fingerprint); + int advertisedBandwidth = advertisedBandwidths.get( + fingerprint); + Set<Integer> allowedExitPorts = exitPorts.get(fingerprint); + if (bandwidthRate < minimumBandwidthRate || + advertisedBandwidth < minimumAdvertisedBandwidth || + !allowedExitPorts.containsAll(minimumRequiredPorts)) { + continue; + } + double exitWeightFraction = exitWeights.get(fingerprint) + / totalExitWeight; + String addressPart = addressParts.get(fingerprint); + if (!exitWeightFractionsByAddressParts.containsKey( + addressPart)) { + exitWeightFractionsByAddressParts.put(addressPart, + new ArrayList<Double>()); + } + exitWeightFractionsByAddressParts.get(addressPart).add( + exitWeightFraction); + } + double totalExitWeightFraction = 0.0; + int totalRelays = 0; + for (List<Double> weightFractions : + exitWeightFractionsByAddressParts.values()) { + Collections.sort(weightFractions); + while (weightFractions.size() > 2) { + weightFractions.remove(0); + } + for (double weightFraction : weightFractions) { + totalExitWeightFraction += weightFraction; + totalRelays++; + } + } + + /* For each setting, append results to results.csv: + * - valid_after: consensus valid-after time + * - min_rate: minimum bandwidth rate in KB/s + * - min_advbw: minimum advertised bandwidth in KB/s + * - ports: "80-443" or "80-443-554-1755" + * - relays: number of relays matching the requirements + * - exit_prob: sum of exit probabilities */ + bw.write(String.format("%s,%d,%d,%s,%d,%.4f%n", + validAfter, minimumBandwidthRate, + minimumAdvertisedBandwidth, minimumRequiredPorts.size() <= 2 + ? "80-443" : "80-443-554-1755", totalRelays, + totalExitWeightFraction)); + } + } + } + bw.close(); + System.out.println("\n" + new Date() + ": Terminating."); + } +} +

1 0