May 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Use a clearer idiom for node identity in router_counts_toward_thresholds
by andrea＠torproject.org 07 May '13

07 May '13

commit a1d7f7ea503f2f739953d6a25ebb5d93981604be Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 5 18:55:19 2013 -0400 Use a clearer idiom for node identity in router_counts_toward_thresholds --- src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 16f297a..8f6d9ec 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1898,7 +1898,7 @@ router_counts_toward_thresholds(const node_t *node, time_t now, } return node->ri && router_is_active(node->ri, node, now) && - !digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) && + !digestmap_get(omit_as_sybil, node->identity) && (dirserv_get_credible_bandwidth_kb(node->ri) >= min_bw_kb) && (have_mbw || !require_mbw); }

1 0

[tor/maint-0.2.4] Fix 8833: crash bug from using NULL node->ri in dirserv.c
by andrea＠torproject.org 07 May '13

07 May '13

commit 139d367f297575a59b96b64a633ed2b6988d60e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 5 18:52:53 2013 -0400 Fix 8833: crash bug from using NULL node->ri in dirserv.c It appears that moria1 crashed because of one instance of this (the one in router_counts_toward_thresholds). The other instance I fixed won't actually have broken anything, but I think it's more clear this way. Fixes bug 8833; bugfix on 0.2.4.12-alpha. --- changes/bug8833 | 3 +++ src/or/dirserv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug8833 b/changes/bug8833 new file mode 100644 index 0000000..681a861 --- /dev/null +++ b/changes/bug8833 @@ -0,0 +1,3 @@ + o Major bugfixes (directory authority): + - Fix a crash bug when building a consensus using an older consensus as + its basis. Fixes bug 8833. Bugfix on 0.2.4.12-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 66a2c14..16f297a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1889,7 +1889,7 @@ router_counts_toward_thresholds(const node_t *node, time_t now, { /* Have measured bw? */ int have_mbw = - dirserv_has_measured_bw(node->ri->cache_info.identity_digest); + dirserv_has_measured_bw(node->identity); uint64_t min_bw_kb = ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER_KB; const or_options_t *options = get_options(); @@ -1959,7 +1959,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, if (router_counts_toward_thresholds(node, now, omit_as_sybil, require_mbw)) { routerinfo_t *ri = node->ri; - const char *id = ri->cache_info.identity_digest; + const char *id = node->identity; uint32_t bw_kb; node->is_exit = (!router_exit_policy_rejects_all(ri) && exit_policy_is_general_exit(ri->exit_policy));

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 07 May '13

07 May '13

commit e099aaf0d6bc3738f0b83cef10f91328e2e1149d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 7 09:15:19 2013 +0000 Update translations for vidalia --- gl/vidalia_gl.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gl/vidalia_gl.po b/gl/vidalia_gl.po index dc00229..e37d32e 100755 --- a/gl/vidalia_gl.po +++ b/gl/vidalia_gl.po @@ -1,14 +1,15 @@ # Translators: # Translators: +# manuel meixide <m.meixide(a)gmail.com>, 2013 # mbouzada <mbouzada(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: translations(a)vidalia-project.net\n" +"PO-Revision-Date: 2013-05-07 09:13+0000\n" +"Last-Translator: manuel meixide <m.meixide(a)gmail.com>\n" +"Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2619,11 +2620,11 @@ msgctxt "NetworkPage" msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" -msgstr "" +msgstr "Marque para encriptar as solicitudes de directorio e, opcionalmente, utilizar repetidores ponte para acceder á rede Tor" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "" +msgstr "O meu Provedor de Internet (ISP) bloquea as conexións á rede Tor" msgctxt "NetworkPage" msgid "Bridge Settings" @@ -2657,7 +2658,7 @@ msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "" +msgstr "Non hai novas pontes dispoñibles. Pode esperar un pouco e tentalo de novo, ou tente outro método de atopar novas pontes." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges."

1 0

[metrics-web/master] Add CSV link for new user estimates.
by karsten＠torproject.org 07 May '13

07 May '13

commit 1dc26636331f26d232dbbd7b3e5e5a78cb4df85e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 7 06:18:30 2013 +0200 Add CSV link for new user estimates. --- rserve/csv.R | 8 ++++++++ .../ernie/web/graphs/RObjectGenerator.java | 1 + web/WEB-INF/users.jsp | 6 ++++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/rserve/csv.R b/rserve/csv.R index 9fdfbbd..efb4486 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -292,3 +292,11 @@ export_bandwidth_flags <- function(path) { quote = FALSE, row.names = FALSE) } +export_userstats <- function(path) { + u <- read.csv(paste("/srv/metrics.torproject.org/task-8462-graphs/", + "task-8462/userstats.csv", sep = ""), + stringsAsFactors = FALSE) + write.csv(format(u, trim = TRUE, scientific = FALSE), path, + quote = FALSE, row.names = FALSE) +} + diff --git a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java index 1fb7183..69092e6 100644 --- a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java @@ -73,6 +73,7 @@ public class RObjectGenerator implements ServletContextListener { this.availableCsvFiles.add("relayflags"); this.availableCsvFiles.add("torperf"); this.availableCsvFiles.add("torperf-failures"); + this.availableCsvFiles.add("userstats"); this.availableCsvFiles.add("versions"); this.availableTables = new HashMap<String, String>(); diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index d7d17d5..93b89b8 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -374,6 +374,12 @@ IPv6 numbers will become more accurate over time.</font> <p>Download graph as <a href="userstats-bridge-version.pdf${userstats_bridge_version_url}">PDF</a> or <a href="userstats-bridge-version.svg${userstats_bridge_version_url}">SVG</a>.</p> +<hr> + +<p><a href="csv/userstats.csv">CSV</a> file containing new user +estimates (BETA).</p> +<br> + </div> </div> <div class="bottom" id="bottom">

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 07 May '13

07 May '13

commit 70824904bbd610d4547f71a3b9cefed2f28084b5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 7 01:45:11 2013 +0000 Update translations for gettor_completed --- ar/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index 088a125..4661915 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -20,9 +20,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2013-05-07 01:24+0000\n" +"Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 07 May '13

07 May '13

commit 348ed975d4ee76c4402deb89a1387139fbd030ea Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 7 01:45:06 2013 +0000 Update translations for gettor --- ar/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index 088a125..4661915 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -20,9 +20,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2013-05-07 01:24+0000\n" +"Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[ooni-probe/master] Include by default the details of the probe
by art＠torproject.org 07 May '13

07 May '13

commit 2523773e5825069e602578353b565d1ec23950c3 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue May 7 02:51:37 2013 +0200 Include by default the details of the probe --- ooniprobe.conf.sample | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index 53e7ac7..bed9da6 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -7,13 +7,13 @@ basic: logfile: ooniprobe.log privacy: # Should we include the IP address of the probe in the report? - includeip: false + includeip: true # Should we include the ASN of the probe in the report? - includeasn: false + includeasn: true # Should we include the country as reported by GeoIP in the report? - includecountry: false + includecountry: true # Should we include the city as reported by GeoIP in the report? - includecity: false + includecity: true # Should we collect a full packet capture on the client? includepcap: false reports:

1 0

[metrics-web/master] Add #8462 graphs.
by karsten＠torproject.org 06 May '13

06 May '13

commit b50aabcced4b363c8fff1c8e8062e471af59735a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 6 20:36:34 2013 +0200 Add #8462 graphs. --- etc/web.xml | 12 ++ rserve/graphs.R | 74 +++++++++ .../ernie/web/graphs/GraphParameterChecker.java | 75 +++++----- .../ernie/web/graphs/RObjectGenerator.java | 8 + web/WEB-INF/users.jsp | 167 ++++++++++++++++++++ 5 files changed, 300 insertions(+), 36 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index 79ac4c1..630af3e 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -197,6 +197,18 @@ <url-pattern>/almost-fast-exits.png</url-pattern> <url-pattern>/almost-fast-exits.pdf</url-pattern> <url-pattern>/almost-fast-exits.svg</url-pattern> + <url-pattern>/userstats-relay-country.png</url-pattern> + <url-pattern>/userstats-relay-country.pdf</url-pattern> + <url-pattern>/userstats-relay-country.svg</url-pattern> + <url-pattern>/userstats-bridge-country.png</url-pattern> + <url-pattern>/userstats-bridge-country.pdf</url-pattern> + <url-pattern>/userstats-bridge-country.svg</url-pattern> + <url-pattern>/userstats-bridge-transport.png</url-pattern> + <url-pattern>/userstats-bridge-transport.pdf</url-pattern> + <url-pattern>/userstats-bridge-transport.svg</url-pattern> + <url-pattern>/userstats-bridge-version.png</url-pattern> + <url-pattern>/userstats-bridge-version.pdf</url-pattern> + <url-pattern>/userstats-bridge-version.svg</url-pattern> </servlet-mapping> <servlet> diff --git a/rserve/graphs.R b/rserve/graphs.R index 72bbc1e..b1ffd86 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -1022,3 +1022,77 @@ plot_bandwidth_flags <- function(start, end, path) { ggsave(filename = path, width = 8, height = 5, dpi = 72) } +plot_userstats <- function(start, end, node, variable, value, path) { + end <- min(end, as.character(Sys.Date())) + u <- read.csv(paste("/srv/metrics.torproject.org/task-8462-graphs/", + "task-8462/userstats.csv", sep = ""), + stringsAsFactors = FALSE) + if (node == 'relay') { + if (value != 'all') { + u <- u[u$country == value & u$node == 'relay', ] + title <- paste("Directly connecting users from ", + countryname(value), " (BETA)\n", sep = "") + } else { + u <- u[u$country == '' & u$transport == '' & u$version == '' & + u$node == 'relay', ] + title <- "Directly connecting users (BETA)\n" + } + } else if (variable == 'transport') { + u <- u[u$transport == value & u$node == 'bridge', ] + title <- paste("Bridge users using transport ", value, " (BETA)\n", + sep = "") + } else if (variable == 'version') { + u <- u[u$version== value & u$node == 'bridge', ] + title <- paste("Bridge users using IP", value, " (BETA)\n", sep = "") + } else { + if (value != 'all') { + u <- u[u$country == value & u$node == 'bridge', ] + title <- paste("Bridge users from ", countryname(value), + " (BETA)\n", sep = "") + } else { + u <- u[u$country == '' & u$transport == '' & u$version == '' & + u$node == 'bridge', ] + title <- "Bridge users (BETA)\n" + } + } + u <- data.frame(date = as.Date(u$date, "%Y-%m-%d"), users = u$users) + dates <- seq(from = as.Date(start, "%Y-%m-%d"), + to = as.Date(end, "%Y-%m-%d"), by="1 day") + missing <- setdiff(dates, u$date) + if (length(missing) > 0) { + u <- rbind(u, + data.frame(date = as.Date(missing, origin = "1970-01-01"), + users = NA)) + } + formatter <- function(x, ...) { format(x, scientific = FALSE, ...) } + date_breaks <- date_breaks( + as.numeric(max(u$date) - min(u$date))) + ggplot(u, aes(x = date, y = users)) + + 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 = "", limits = c(0, + ifelse(length(na.omit(u$users)) == 0, 0, + max(u$users, na.rm = TRUE))), formatter = formatter) + + opts(title = title) + ggsave(filename = path, width = 8, height = 5, dpi = 72) +} + +plot_userstats_relay_country <- function(start, end, country, path) { + plot_userstats(start, end, 'relay', 'country', country, path) +} + +plot_userstats_bridge_country <- function(start, end, country, path) { + plot_userstats(start, end, 'bridge', 'country', country, path) +} + +plot_userstats_bridge_transport <- function(start, end, transport, path) { + plot_userstats(start, end, 'bridge', 'transport', transport, path) +} + +plot_userstats_bridge_version <- function(start, end, version, path) { + plot_userstats(start, end, 'bridge', 'version', version, path) +} + diff --git a/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java b/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java index 8300be5..74ca6f9 100644 --- a/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java @@ -56,9 +56,11 @@ public class GraphParameterChecker { } this.knownParameterValues.put("country", sb.toString()); this.knownParameterValues.put("events", "on,off,points"); - this.knownParameterValues.put("language", "all,en,zh_CN,fa"); this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); + this.knownParameterValues.put("transport", + "obfs2,obfs3,websocket,<OR>,<??>"); + this.knownParameterValues.put("version", "v4,v6"); } public void setAvailableGraphs(Map<String, String> availableGraphs) { @@ -187,26 +189,6 @@ public class GraphParameterChecker { recognizedGraphParameters.put("events", eventsParameter); } - /* Parse language if supported by the graph type. Only a single - * language can be passed. If no language is passed, use "all" as - * default. */ - if (supportedGraphParameters.contains("language")) { - String[] languageParameter = (String[]) requestParameters.get( - "language"); - List<String> knownBundles = Arrays.asList( - this.knownParameterValues.get("language").split(",")); - if (languageParameter != null) { - if (languageParameter.length != 1 || - languageParameter[0].length() == 0 || - !knownBundles.contains(languageParameter[0])) { - return null; - } - } else { - languageParameter = new String[] { "all" }; - } - recognizedGraphParameters.put("language", languageParameter); - } - /* Parse torperf data source if supported by the graph type. Only a * single source can be passed. If no source is passed, use "torperf" * as default. */ @@ -251,23 +233,44 @@ public class GraphParameterChecker { recognizedGraphParameters.put("filesize", filesizeParameter); } - /* Parse fingerprint if supported/required by the graph type. Make - * sure the fingerprint contains only hexadecimal characters and is 40 - * characters long. Fail if no fingerprint is provided! */ - if (supportedGraphParameters.contains("fingerprint")) { - String[] fingerprintParameter = (String[]) requestParameters.get( - "fingerprint"); - if (fingerprintParameter == null || - fingerprintParameter.length != 1 || - fingerprintParameter[0] == null || - !Pattern.matches("[0-9a-f]{40}", - fingerprintParameter[0].toLowerCase())) { - return null; + /* Parse transports if supported by the graph type. If no transports + * are passed, use "<OR>" as default. */ + if (supportedGraphParameters.contains("transport")) { + String[] transportParameters = (String[]) requestParameters.get( + "transport"); + List<String> knownTransports = Arrays.asList( + this.knownParameterValues.get("transport").split(",")); + if (transportParameters != null) { + for (String transport : transportParameters) { + if (transport == null || transport.length() == 0 || + !knownTransports.contains(transport)) { + return null; + } + } + } else { + transportParameters = new String[] { "<OR>" }; + } + recognizedGraphParameters.put("transport", transportParameters); + } + + /* Parse versions if supported by the graph type. If no versions + * are passed, use "v4" as default. */ + if (supportedGraphParameters.contains("version")) { + String[] versionParameters = (String[]) requestParameters.get( + "version"); + List<String> knownVersions = Arrays.asList( + this.knownParameterValues.get("version").split(",")); + if (versionParameters != null) { + for (String version : versionParameters) { + if (version == null || version.length() == 0 || + !knownVersions.contains(version)) { + return null; + } + } } else { - fingerprintParameter[0] = fingerprintParameter[0].toLowerCase(); - recognizedGraphParameters.put("fingerprint", - fingerprintParameter); + versionParameters = new String[] { "v4" }; } + recognizedGraphParameters.put("version", versionParameters); } /* We now have a map with all required graph parameters. Return it. */ diff --git a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java index 6ed77f2..1fb7183 100644 --- a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java @@ -105,6 +105,14 @@ public class RObjectGenerator implements ServletContextListener { this.availableGraphs.put("connbidirect", "start,end,filename"); this.availableGraphs.put("fast-exits", "start,end,filename"); this.availableGraphs.put("almost-fast-exits", "start,end,filename"); + this.availableGraphs.put("userstats-relay-country", + "start,end,country,filename"); + this.availableGraphs.put("userstats-bridge-country", + "start,end,country,filename"); + this.availableGraphs.put("userstats-bridge-transport", + "start,end,transport,filename"); + this.availableGraphs.put("userstats-bridge-version", + "start,end,version,filename"); this.availableGraphFileTypes = new HashSet<String>(Arrays.asList( "png,pdf,svg".split(","))); GraphParameterChecker.getInstance().setAvailableGraphs( diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index d75bf7a..d7d17d5 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -207,6 +207,173 @@ Tor users (direct and bridge) per month by country.</p> <p><a href="csv/monthly-users-average.csv">CSV</a> file containing average daily Tor users (direct and bridge) per month by country.</p> <br> + +<a name="userstats"></a> +<h3><a href="#userstats" class="anchor">New approach to estimating daily +Tor users (BETA)</a></h3> +<br> +<p>As of April 2013, we are experimenting with a new approach to estimating +daily Tor users. +The new approach works very similar to the existing approach to estimate +directly connecting users, but can also be applied to bridge users. +This new approach can break down user numbers by country, pluggable +transport, and IP version. +See tech report on +<a href="https://research.torproject.org/techreports/counting-daily-bridge-users-201…">Counting daily bridge users</a> +and the +<a href="https://gitweb.torproject.org/metrics-tasks.git/tree/HEAD:/task-8462">source code</a> +for details. + +<p><font color="red">Note that this approach should be considered +experimental and absolute numbers should be taken with care!</font></p> + +<a name="userstats-relay-country"></a> +<p><b>Direct users by country (BETA):</b></p> + +<font color="red">In contrast to the graphs above, this graph is based on +requests to directory mirrors <i>and</i> directory authorities. +That is why the numbers here are higher. +It's yet to be decided which approach is more correct.</font> + +<img src="userstats-relay-country.png${userstats_relay_country_url}" + width="576" height="360" alt="Direct users by country graph (BETA)"> +<form action="users.html#userstats-relay-country"> + <div class="formrow"> + <input type="hidden" name="graph" value="userstats-relay-country"> + <p> + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(userstats_relay_country_start) == 0}">${default_start_date}</c:when><c:otherwise>${userstats_relay_country_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(userstats_relay_country_end) == 0}">${default_end_date}</c:when><c:otherwise>${userstats_relay_country_end[0]}</c:otherwise></c:choose>"> + </p><p> + Source: <select name="country"> + <option value="all"<c:if test="${userstats_relay_country_country[0] eq 'all'}"> selected</c:if>>All users</option> + <c:forEach var="country" items="${countries}" > + <option value="${country[0]}"<c:if test="${userstats_relay_country_country[0] eq country[0]}"> selected</c:if>>${country[1]}</option> + </c:forEach> + </select> + </p><p> + <input class="submit" type="submit" value="Update graph"> + </p> + </div> +</form> +<p>Download graph as +<a href="userstats-relay-country.pdf${userstats_relay_country_url}">PDF</a> or +<a href="userstats-relay-country.svg${userstats_relay_country_url}">SVG</a>.</p> +<hr> + +<a name="userstats-bridge-country"></a> +<p><b>Bridge users by country (BETA):</b></p> + +<font color="red">In contrast to the bridge-user graph above, this graph +uses directory requests to estimate user numbers, not unique IP address sets. +It's yet to be decided which approach is more correct.</font> + +<img src="userstats-bridge-country.png${userstats_bridge_country_url}" + width="576" height="360" alt="Bridge users by country graph (BETA)"> +<form action="users.html#userstats-bridge-country"> + <div class="formrow"> + <input type="hidden" name="graph" value="userstats-bridge-country"> + <p> + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(userstats_bridge_country_start) == 0}">${default_start_date}</c:when><c:otherwise>${userstats_bridge_country_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(userstats_bridge_country_end) == 0}">${default_end_date}</c:when><c:otherwise>${userstats_bridge_country_end[0]}</c:otherwise></c:choose>"> + </p><p> + Source: <select name="country"> + <option value="all"<c:if test="${userstats_bridge_country_country[0] eq 'all'}"> selected</c:if>>All users</option> + <c:forEach var="country" items="${countries}" > + <option value="${country[0]}"<c:if test="${userstats_bridge_country_country[0] eq country[0]}"> selected</c:if>>${country[1]}</option> + </c:forEach> + </select> + </p><p> + <input class="submit" type="submit" value="Update graph"> + </p> + </div> +</form> +<p>Download graph as +<a href="userstats-bridge-country.pdf${userstats_bridge_country_url}">PDF</a> or +<a href="userstats-bridge-country.svg${userstats_bridge_country_url}">SVG</a>.</p> +<hr> + +<a name="userstats-bridge-transport"></a> +<p><b>Bridge users by transport (BETA):</b></p> + +<font color="red">Almost none of the currently running bridges report the +transport name of connecting users, which is why non-OR transport usage is +so low. +By default, we consider all users of a bridge OR transport users, unless told +otherwise. +Non-OR transport numbers will become more accurate over time.</font> + +<img src="userstats-bridge-transport.png${userstats_bridge_transport_url}" + width="576" height="360" alt="Bridge users by transport graph (BETA)"> +<form action="users.html#userstats-bridge-transport"> + <div class="formrow"> + <input type="hidden" name="graph" value="userstats-bridge-transport"> + <p> + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(userstats_bridge_transport_start) == 0}">${default_start_date}</c:when><c:otherwise>${userstats_bridge_transport_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(userstats_bridge_transport_end) == 0}">${default_end_date}</c:when><c:otherwise>${userstats_bridge_transport_end[0]}</c:otherwise></c:choose>"> + </p><p> + Source: <select name="transport"> + <option value="<OR>"<c:if test="${userstats_bridge_transport_transport[0] eq '<OR>'}"> selected</c:if>>Default OR protocol</option> + <option value="obfs2"<c:if test="${userstats_bridge_transport_transport[0] eq 'obfs2'}"> selected</c:if>>obfs2</option> + <option value="obfs3"<c:if test="${userstats_bridge_transport_transport[0] eq 'obfs3'}"> selected</c:if>>obfs3</option> + <option value="websocket"<c:if test="${userstats_bridge_transport_transport[0] eq 'websocket'}"> selected</c:if>>Flash proxy/websocket</option> + <option value="<??>"<c:if test="${userstats_bridge_transport_transport[0] eq '<??>'}"> selected</c:if>>Unknown transport</option> + </select> + </p><p> + <input class="submit" type="submit" value="Update graph"> + </p> + </div> +</form> +<p>Download graph as +<a href="userstats-bridge-transport.pdf${userstats_bridge_transport_url}">PDF</a> or +<a href="userstats-bridge-transport.svg${userstats_bridge_transport_url}">SVG</a>.</p> +<hr> + +<a name="userstats-bridge-version"></a> +<p><b>Bridge users by IP version (BETA):</b></p> + +<font color="red">Not all of the currently running bridges report the +IP version of connecting users. +By default, we consider all users of a bridge IPv4 users, unless told +otherwise. +IPv6 numbers will become more accurate over time.</font> + +<img src="userstats-bridge-version.png${userstats_bridge_version_url}" + width="576" height="360" alt="Bridge users by IP version graph (BETA)"> +<form action="users.html#userstats-bridge-version"> + <div class="formrow"> + <input type="hidden" name="graph" value="userstats-bridge-version"> + <p> + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(userstats_bridge_version_start) == 0}">${default_start_date}</c:when><c:otherwise>${userstats_bridge_version_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(userstats_bridge_version_end) == 0}">${default_end_date}</c:when><c:otherwise>${userstats_bridge_version_end[0]}</c:otherwise></c:choose>"> + </p><p> + Source: <select name="version"> + <option value="v4"<c:if test="${userstats_bridge_version_version[0] eq 'v4'}"> selected</c:if>>IPv4</option> + <option value="v6"<c:if test="${userstats_bridge_version_version[0] eq 'v6'}"> selected</c:if>>IPv6</option> + </select> + </p><p> + <input class="submit" type="submit" value="Update graph"> + </p> + </div> +</form> +<p>Download graph as +<a href="userstats-bridge-version.pdf${userstats_bridge_version_url}">PDF</a> or +<a href="userstats-bridge-version.svg${userstats_bridge_version_url}">SVG</a>.</p> </div> </div> <div class="bottom" id="bottom">

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 06 May '13

06 May '13

commit 480e0c21a195808c0fdb11876a3b9a915428960b Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 6 17:45:13 2013 +0000 Update translations for orbot_completed --- values-fr/strings.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 8a356a4..a3e8340 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -12,8 +12,8 @@ <string name="status_disabled">\"Orbot est désactivé</string> <string name="status_shutting_down">Orbot s\'arrête</string> <string name="tor_process_starting">Lancement du client Tor</string> - <string name="tor_process_complete">Terminé</string> - <string name="tor_process_waiting">Attente...</string> + <string name="tor_process_complete">terminé.</string> + <string name="tor_process_waiting">attente.</string> <string name="not_anonymous_yet">AVERTISSEMENT: Votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string> <string name="menu_home">Accueil</string> <string name="menu_browse">Parcourir</string> @@ -47,7 +47,7 @@ <string name="pref_has_root">Demander un accès privilégié</string> <string name="pref_has_root_summary">Demande un accès privilégié pour le proxy transparent</string> <string name="status_install_success">Tor a été installé avec succès !</string> - <string name="status_install_fail">Tor n\'a pas pu installé. S\'il vous plaît, vérifiez le fichier journal et contactez tor-assistants(a)torproject.org</string> + <string name="status_install_fail">Tor n\'a pu être installé. Veuillez vérifier le fichier journal et contacter tor-assistants(a)torproject.org</string> <string name="title_error">Erreur de l\'application</string> <string name="wizard_title">Bienvenue dans Orbot</string> <string name="wizard_btn_tell_me_more">À propos de Orbot</string> @@ -62,12 +62,12 @@ <string name="wizard_permissions_root">Permission accordée</string> <string name="wizard_permissions_stock">Permissions d\'Orbot</string> <string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté que vous avez donné les droits privilégiés pour Orbot. Nous utiliserions ces droits avec sagesse.</string> - <string name="wizard_permissions_msg_stock"> Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string> - <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela est, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string> + <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string> + <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela signifie, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string> <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans les droits privilégiés</string> <string name="wizard_permission_enable_root">Donner les droits privilégiés à Orbot</string> <string name="wizard_configure">Configurer la Torification</string> - <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application</string> + <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application.</string> <string name="wizard_configure_all">Toutes les applications par Tor</string> <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string> <string name="wizard_tips_tricks">Applications avec Orbot</string> @@ -82,7 +82,7 @@ <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n /n/n\n Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot est prêt!</string> + <string name="wizard_final">Orbot est prêt !</string> <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string>  <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\' du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string> @@ -153,7 +153,7 @@ <string name="setting_up_port_based_transparent_proxying_">Configuration du proxy transparent par port...</string> <string name="bridge_error">Erreur de passerelle</string> <string name="bridge_requires_ip">Avant de pouvoir utiliser les passerelles, vous devez entrer au moins l\'adresse IP d\'une passerelle</string> - <string name="send_email_for_bridges">Envoyez un e-mail à bridges(a)torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail</string> + <string name="send_email_for_bridges">Envoyez un e-mail à bridges(a)torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail.</string> <string name="error">Erreur</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Les paramètres pour ReachableAddresses ont provoqué une erreur !</string> <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont provoqué une erreur !</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 06 May '13

06 May '13

commit 354795efae74e049d21d8723b6ac1b99251cd5eb Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 6 17:45:09 2013 +0000 Update translations for orbot --- values-fr/strings.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 8a356a4..a3e8340 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -12,8 +12,8 @@ <string name="status_disabled">\"Orbot est désactivé</string> <string name="status_shutting_down">Orbot s\'arrête</string> <string name="tor_process_starting">Lancement du client Tor</string> - <string name="tor_process_complete">Terminé</string> - <string name="tor_process_waiting">Attente...</string> + <string name="tor_process_complete">terminé.</string> + <string name="tor_process_waiting">attente.</string> <string name="not_anonymous_yet">AVERTISSEMENT: Votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string> <string name="menu_home">Accueil</string> <string name="menu_browse">Parcourir</string> @@ -47,7 +47,7 @@ <string name="pref_has_root">Demander un accès privilégié</string> <string name="pref_has_root_summary">Demande un accès privilégié pour le proxy transparent</string> <string name="status_install_success">Tor a été installé avec succès !</string> - <string name="status_install_fail">Tor n\'a pas pu installé. S\'il vous plaît, vérifiez le fichier journal et contactez tor-assistants(a)torproject.org</string> + <string name="status_install_fail">Tor n\'a pu être installé. Veuillez vérifier le fichier journal et contacter tor-assistants(a)torproject.org</string> <string name="title_error">Erreur de l\'application</string> <string name="wizard_title">Bienvenue dans Orbot</string> <string name="wizard_btn_tell_me_more">À propos de Orbot</string> @@ -62,12 +62,12 @@ <string name="wizard_permissions_root">Permission accordée</string> <string name="wizard_permissions_stock">Permissions d\'Orbot</string> <string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté que vous avez donné les droits privilégiés pour Orbot. Nous utiliserions ces droits avec sagesse.</string> - <string name="wizard_permissions_msg_stock"> Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string> - <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela est, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string> + <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string> + <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela signifie, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string> <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans les droits privilégiés</string> <string name="wizard_permission_enable_root">Donner les droits privilégiés à Orbot</string> <string name="wizard_configure">Configurer la Torification</string> - <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application</string> + <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application.</string> <string name="wizard_configure_all">Toutes les applications par Tor</string> <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string> <string name="wizard_tips_tricks">Applications avec Orbot</string> @@ -82,7 +82,7 @@ <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n /n/n\n Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot est prêt!</string> + <string name="wizard_final">Orbot est prêt !</string> <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string>  <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\' du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string> @@ -153,7 +153,7 @@ <string name="setting_up_port_based_transparent_proxying_">Configuration du proxy transparent par port...</string> <string name="bridge_error">Erreur de passerelle</string> <string name="bridge_requires_ip">Avant de pouvoir utiliser les passerelles, vous devez entrer au moins l\'adresse IP d\'une passerelle</string> - <string name="send_email_for_bridges">Envoyez un e-mail à bridges(a)torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail</string> + <string name="send_email_for_bridges">Envoyez un e-mail à bridges(a)torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail.</string> <string name="error">Erreur</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Les paramètres pour ReachableAddresses ont provoqué une erreur !</string> <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont provoqué une erreur !</string>

1 0