September 2014 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 13 Sep '14

13 Sep '14

commit 3958c48b83e667fc7a34f4278b8e5ef0101f1e76 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 13 19:15:39 2014 +0000 Update translations for tor-launcher-network-settings --- hu/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd index 5611fc0..cf616e4 100644 --- a/hu/network-settings.dtd +++ b/hu/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nem"> <!ENTITY torSettings.firstQuestion "A következők közül melyik illik jobban a szituációhoz?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Ennek a számítógépnek a forgalma cenzorált vagy proxizott."> +<!ENTITY torSettings.configurePrompt2 "Szükségem van a bride és proxy beállítások megadására."> <!ENTITY torSettings.configure "Beállít"> <!ENTITY torSettings.connectPrompt2 "Szeretnék közvetlenül kapcsolódni a Tor hálózathoz."> <!ENTITY torSettings.connectPrompt3 "A legtöbb esetben ez működni fog."> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Interneten keresztül"> <!ENTITY torsettings.bridgeHelp2 "Használj egy böngészőt megnézni ezt az oldalt: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Az automata email válaszok által."> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Küldjön emailt a bridges(a)torproject.org címre 'get bridges' szöveggel a levél törzsében.  Ahhoz, hogy a híd címeket a támadók nehezeben tanulják meg, ezt a kérést az alábbi szolgáltatóktól kell küldenia (a javasolt sorrendben listázva):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, vagy https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A támogatáson keresztül."> <!ENTITY torsettings.bridgeHelp4 "Utolsó lehetőségként küldj egy udvarias bridge igénylő emailt ide: help(a)rt.torproject.org.  Légyszíves vedd figyelembe az adott személynek több emailt kell megválaszolnia.">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 13 Sep '14

13 Sep '14

commit 184c9486e5b3b1a638e61fc90b8ee49176c49f2d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 13 19:15:35 2014 +0000 Update translations for tor-launcher-properties_completed --- hu/torlauncher.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hu/torlauncher.properties b/hu/torlauncher.properties index 47d9543..c841168 100644 --- a/hu/torlauncher.properties +++ b/hu/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Indító -torlauncher.tor_exited=A Tor váratlanul kilépett. -torlauncher.tor_connection_lost=A kapcsolat a Tor hálózattal megszakadt. +torlauncher.tor_exited=A Tor váratlanul kilépet. Ez bekövetkezhet a Tor-ban található hibából, egy a rendszeren található másik programból, vagy hibás harverből. Amíg nem indítja újra a tor-t addig a Tor böngésző nem ér el semmilyen oldalt. Ha a hiba folyamatosan fennáll, kérjük küldje le a Tor Log-ot a támogatási csoportnak. +torlauncher.tor_exited2=A Tor újraindítása nem fogja bezárni a böngésző füleket. torlauncher.tor_controlconn_failed=Nem lehetséges csatlakozni a Tor vezérlő portjára torlauncher.tor_failed_to_start=Nem sikerült elindulnia a Tor-nak. torlauncher.tor_control_failed=Nem sikerült átvenni a Tor vezérlését. @@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Nincs egy híd sem aminek az átviteli torlauncher.recommended_bridge=(ajánlott) torlauncher.connect=Csatlakozás -torlauncher.reconnect=Újrakapcsolódás +torlauncher.restart_tor=Tor újraindítása torlauncher.quit=Kilépés torlauncher.quit_win=Kilépés torlauncher.done=Kész torlauncher.forAssistance=Segítségér kérjük írjon ide: %S +torlauncher.copiedNLogMessages=Másolás kész. %S Tor log üzenet vár arra, hogy beillesszék egy szövegszerkesztővbe vagy egy emailbe. + torlauncher.bootstrapStatus.conn_dir=Csatlakozás egy Elosztó címtárhoz torlauncher.bootstrapStatus.handshake_dir=Titkosított címtárkapcsolat létrehozása torlauncher.bootstrapStatus.requesting_status=Hálózat státuszának lekérdezése

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 13 Sep '14

13 Sep '14

commit d8cbafc6b29e93a98758ca69b388add4d08fd64b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 13 19:15:30 2014 +0000 Update translations for tor-launcher-properties --- hu/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hu/torlauncher.properties b/hu/torlauncher.properties index bc73c2b..c841168 100644 --- a/hu/torlauncher.properties +++ b/hu/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Indító -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=A Tor váratlanul kilépet. Ez bekövetkezhet a Tor-ban található hibából, egy a rendszeren található másik programból, vagy hibás harverből. Amíg nem indítja újra a tor-t addig a Tor böngésző nem ér el semmilyen oldalt. Ha a hiba folyamatosan fennáll, kérjük küldje le a Tor Log-ot a támogatási csoportnak. +torlauncher.tor_exited2=A Tor újraindítása nem fogja bezárni a böngésző füleket. torlauncher.tor_controlconn_failed=Nem lehetséges csatlakozni a Tor vezérlő portjára torlauncher.tor_failed_to_start=Nem sikerült elindulnia a Tor-nak. torlauncher.tor_control_failed=Nem sikerült átvenni a Tor vezérlését. @@ -37,7 +37,7 @@ torlauncher.done=Kész torlauncher.forAssistance=Segítségér kérjük írjon ide: %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Másolás kész. %S Tor log üzenet vár arra, hogy beillesszék egy szövegszerkesztővbe vagy egy emailbe. torlauncher.bootstrapStatus.conn_dir=Csatlakozás egy Elosztó címtárhoz torlauncher.bootstrapStatus.handshake_dir=Titkosított címtárkapcsolat létrehozása

1 0

[metrics-web/master] Allow multiple transports to be displayed at once.
by karsten＠torproject.org 13 Sep '14

13 Sep '14

commit 2e474bd7e77d67708c91fce9257ee39cff828082 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 9 10:23:48 2014 +0200 Allow multiple transports to be displayed at once. Implements a feature requested by asn in #12432. --- website/rserve/graphs.R | 91 +++++++++++++++----- .../metrics/web/graphs/GraphParameterChecker.java | 8 +- website/web/WEB-INF/users.jsp | 21 +++-- 3 files changed, 87 insertions(+), 33 deletions(-) diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index 68a8b7d..d546127 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -795,19 +795,56 @@ plot_userstats <- function(start, end, node, variable, value, events, u$node == 'relay', ] title <- "Directly connecting users\n" } + u <- aggregate(list(lower = u$lower, upper = u$upper, + users = u$clients), + by = list(date = as.Date(u$date, "%Y-%m-%d"), + value = u$country), + FUN = sum) } else if (variable == 'transport') { - if (value != '!<*>') { - u <- u[u$transport == value & u$node == 'bridge', ] - title <- paste("Bridge users using transport ", value, "\n", - sep = "") + if ('!<OR>' %in% value) { + n <- u[u$transport != '' & u$transport != '<OR>' & + u$node == 'bridge', ] + n <- aggregate(list(lower = n$lower, upper = n$upper, + clients = n$clients), + by = list(date = n$date), + FUN = sum) + u <- rbind(u, data.frame(date = n$date, node = 'bridge', + country = '', transport = '!<OR>', + version = '', lower = n$lower, + upper = n$upper, clients = n$clients, + frac = NA)) + } + if (length(value) > 1) { + u <- u[u$transport %in% value & u$node == 'bridge', ] + u <- aggregate(list(lower = u$lower, upper = u$upper, + users = u$clients), + by = list(date = as.Date(u$date, "%Y-%m-%d"), + value = u$transport), + FUN = sum) + title <- paste("Bridge users by transport\n") } else { - u <- u[u$transport != '' & u$transport != '<OR>' & - u$node == 'bridge', ] - title <- paste("Bridge users using any pluggable transport\n") + u <- u[u$transport == value & u$node == 'bridge', ] + u <- aggregate(list(lower = u$lower, upper = u$upper, + users = u$clients), + by = list(date = as.Date(u$date, "%Y-%m-%d"), + value = u$transport), + FUN = sum) + title <- paste("Bridge users using ", + ifelse(value == '<??>', 'unknown pluggable transport(s)', + ifelse(value == '<OR>', 'default OR protocol', + ifelse(value == '!<OR>', 'any pluggable transport', + ifelse(value == 'fte', 'FTE', + ifelse(value == 'websocket', 'Flash proxy/websocket', + paste('transport', value)))))), "\n", sep = "") } } else if (variable == 'version') { - u <- u[u$version== value & u$node == 'bridge', ] + u <- u[u$version == value & u$node == 'bridge', ] title <- paste("Bridge users using IP", value, "\n", sep = "") + u <- aggregate(list(lower = u$lower, upper = u$upper, + users = u$clients), + by = list(date = as.Date(u$date, "%Y-%m-%d"), + value = u$version), + FUN = sum) } else { if (value != 'all') { u <- u[u$country == value & u$node == 'bridge', ] @@ -818,26 +855,28 @@ plot_userstats <- function(start, end, node, variable, value, events, u$node == 'bridge', ] title <- "Bridge users\n" } + u <- aggregate(list(lower = u$lower, upper = u$upper, + users = u$clients), + by = list(date = as.Date(u$date, "%Y-%m-%d"), + value = u$country), + FUN = sum) } - u <- aggregate(list(lower = u$lower, upper = u$upper, - users = u$clients), - by = list(date = as.Date(u$date, "%Y-%m-%d")), FUN = sum) - 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, lower = NA, upper = NA)) - } + u <- merge(x = u, all.y = TRUE, y = data.frame(expand.grid( + date = seq(from = as.Date(start, "%Y-%m-%d"), + to = as.Date(end, "%Y-%m-%d"), by="1 day"), + value = ifelse(value == 'all', '', value)))) formatter <- function(x, ...) { format(x, scientific = FALSE, ...) } date_breaks <- date_breaks( as.numeric(max(u$date) - min(u$date))) max_y <- ifelse(length(na.omit(u$users)) == 0, 0, max(u$users, na.rm = TRUE)) - plot <- ggplot(u, aes(x = date, y = users)) + if (length(value) > 1) { + plot <- ggplot(u, aes(x = date, y = users, colour = value)) + } else { + plot <- ggplot(u, aes(x = date, y = users)) + } if (length(na.omit(u$users)) > 0 & events != "off" & - variable == 'country' & value != "all") { + variable == 'country' & length(value) == 1 && value != "all") { upturns <- u[u$users > u$upper, c("date", "users")] downturns <- u[u$users <= u$lower, c("date", "users")] if (events == "on") { @@ -865,6 +904,16 @@ plot_userstats <- function(start, end, node, variable, value, events, scale_y_continuous(name = "", limits = c(0, max_y), formatter = formatter) + opts(title = title) + if (length(value) > 1) { + plot <- plot + + scale_colour_hue(name = "", breaks = value, + labels = ifelse(value == '<??>', 'Unknown PT', + ifelse(value == '<OR>', 'Default OR protocol', + ifelse(value == '!<OR>', 'Any PT', + ifelse(value == 'fte', 'FTE', + ifelse(value == 'websocket', 'Flash proxy/websocket', + value)))))) + } ggsave(filename = path, width = 8, height = 5, dpi = 72) } diff --git a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java index ab77943..223a289 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java @@ -59,7 +59,7 @@ public class GraphParameterChecker { this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); this.knownParameterValues.put("transport", - "obfs2,obfs3,websocket,fte,meek,scramblesuit,<OR>,<??>,!<*>"); + "obfs2,obfs3,websocket,fte,meek,scramblesuit,<OR>,<??>,!<OR>"); this.knownParameterValues.put("version", "v4,v6"); this.knownParameterValues.put("p", "100,99,98,97,95,91,90,80,75,70," + "60,50,40,30,25,20,10,9,5,3,2,1,0"); @@ -161,6 +161,9 @@ public class GraphParameterChecker { List<String> knownCountries = Arrays.asList( this.knownParameterValues.get("country").split(",")); if (countryParameters != null) { + if (countryParameters.length != 1) { + return null; + } for (String country : countryParameters) { if (country == null || country.length() == 0 || !knownCountries.contains(country)) { @@ -265,6 +268,9 @@ public class GraphParameterChecker { List<String> knownVersions = Arrays.asList( this.knownParameterValues.get("version").split(",")); if (versionParameters != null) { + if (versionParameters.length != 1) { + return null; + } for (String version : versionParameters) { if (version == null || version.length() == 0 || !knownVersions.contains(version)) { diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp index 400fd31..04eeaf9 100644 --- a/website/web/WEB-INF/users.jsp +++ b/website/web/WEB-INF/users.jsp @@ -232,17 +232,16 @@ Bridge users by transport: <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="fte"<c:if test="${userstats_bridge_transport_transport[0] eq 'fte'}"> selected</c:if>>FTE</option> - <option value="meek"<c:if test="${userstats_bridge_transport_transport[0] eq 'meek'}"> selected</c:if>>meek</option> - <option value="scramblesuit"<c:if test="${userstats_bridge_transport_transport[0] eq 'scramblesuit'}"> selected</c:if>>scramblesuit</option> - <option value="<??>"<c:if test="${userstats_bridge_transport_transport[0] eq '<??>'}"> selected</c:if>>Unknown transport</option> - <option value="!<*>"<c:if test="${userstats_bridge_transport_transport[0] eq '!<*>'}"> selected</c:if>>Any non-OR transport</option> - </select> + <label>Source: </label> + <input type="checkbox" name="transport" value="<OR>"<c:if test="${fn:length(userstats_bridge_transport_transport) == 0 or fn:contains(fn:join(userstats_bridge_transport_transport, ','), '<OR>')}"> checked</c:if>> Default OR protocol + <input type="checkbox" name="transport" value="obfs2"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'obfs2')}"> checked</c:if>> obfs2 + <input type="checkbox" name="transport" value="obfs3"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'obfs3')}"> checked</c:if>> obfs3 + <input type="checkbox" name="transport" value="websocket"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'websocket')}"> checked</c:if>> Flash proxy/websocket + <input type="checkbox" name="transport" value="fte"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'fte')}"> checked</c:if>> FTE + <input type="checkbox" name="transport" value="meek"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'meek')}"> checked</c:if>> meek + <input type="checkbox" name="transport" value="scramblesuit"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'scramblesuit')}"> checked</c:if>> scramblesuit + <input type="checkbox" name="transport" value="<??>"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), '<??>')}"> checked</c:if>> Unknown pluggable transport(s) + <input type="checkbox" name="transport" value="!<OR>"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), '!<OR>')}"> checked</c:if>> Any pluggable transport </p><p> <input class="submit" type="submit" value="Update graph"> </p>

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 13 Sep '14

13 Sep '14

commit e77faa2cdaa6fe7ccc4c9aef4cb047731fbc7eff Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 13 00:46:22 2014 +0000 Update translations for torbutton-torbuttonproperties --- ro/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/torbutton.properties b/ro/torbutton.properties index 2b74fc2..6c22ab7 100644 --- a/ro/torbutton.properties +++ b/ro/torbutton.properties @@ -49,7 +49,7 @@ torbutton.popup.never_ask_again = Nu mai intreba din nou # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.notNow=Nu acum canvas.notNowAccessKey=N canvas.allow=Allow in the future canvas.allowAccessKey=A

1 0

[tor/master] Mention "make check" in doc/HACKING
by nickm＠torproject.org 12 Sep '14

12 Sep '14

commit f8f0cb0443c0709454c9223f25266ec1b0c464b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 12 16:14:49 2014 -0400 Mention "make check" in doc/HACKING --- doc/HACKING | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/HACKING b/doc/HACKING index b1733ab..2052a9d 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -139,6 +139,11 @@ Running the unit tests To quickly run all tests: ----- + make check +----- + +To run unit tests only: +----- make test -----

1 0

[tor/master] Give an example how to run the unit tests
by nickm＠torproject.org 12 Sep '14

12 Sep '14

commit 84489011480a031e156cdae8ed32dd7597808994 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 12 22:08:27 2014 +0200 Give an example how to run the unit tests --- doc/HACKING | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/HACKING b/doc/HACKING index 4e9c4e3..b1733ab 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -134,6 +134,22 @@ output directory, use `make coverage-html HTML_COVER_DIR=./funky_new_cov_dir`. Coverage diffs using lcov are not currently implemented, but are being investigated (as of July 2014). +Running the unit tests +~~~~~~~~~~~~~~~~~~~~~~ + +To quickly run all tests: +----- + make test +----- + +To selectively run just some tests (the following can be combined +arbitrarily): +----- + ./src/test/test <name_of_test> [<name of test 2>] ... + ./src/test/test <prefix_of_name_of_test>.. [<prefix_of_name_of_test2>..] ... + ./src/test/test :<name_of_excluded_test> [:<name_of_excluded_test2]... +----- + Running gcov for unit test coverage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

[onionoo/master] Add documentation discussed with iwakeh in #13004.
by karsten＠torproject.org 12 Sep '14

12 Sep '14

commit fce8a56ea1d815f0a66e99148dd5d5b041fc486b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 12 20:44:19 2014 +0200 Add documentation discussed with iwakeh in #13004. --- CONTRIB.md | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ HOWTO-VAGRANT.md | 73 -------------- README.md | 16 +++ 3 files changed, 309 insertions(+), 73 deletions(-) diff --git a/CONTRIB.md b/CONTRIB.md new file mode 100644 index 0000000..244d6a1 --- /dev/null +++ b/CONTRIB.md @@ -0,0 +1,293 @@ +# Contributor Guide + +This guide is meant for people who want to contribute patches to Onionoo. +It contains the following sections: + + - Patch format + - Whitespace conventions + - Vagrant-based development environment + - Documentation overview + +## Patch format + +Format your patches using `git format-patch` if you want to submit just a +single, small commit. +If you want to submit more than one commit, push your changes to a public +Git repository somewhere that can be pulled from. + +## Whitespace conventions + +Whitespace conventions are important, because whitespace changes bloat +patches and make them harder to review. +If we all agree on the same whitespace conventions, the only changes to +review are actually meaningful changes. +If you need to make whitespace changes, because files did not conform to +whitespace conventions before, do these changes in one or more separate +commits that contain nothing else than whitespace changes. + +The following whitespace conventions apply: + + - Maximum line width is 74 characters. Why 74? Because it looks pretty +in vim in a 80-character terminal with line numbers turned on. + - Full sentences are followed by a period and two spaces. An exception +to this rule are sentences in markup files like Markdown; in this case, +each sentence should start with a newline, so that a change in one +sentence doesn't cause changes to all subsequent sentences. An exception +to this exception are multiple sentences in a single bullet point. + - Indentations use two spaces, no tabs. Continuations use four spaces. + - Attributes and methods are typically separated by two newlines. An +exception are attributes with getters and setters which can be written +without separating newlines. + - All source files end with two newlines. + +## Vagrant-based development environment + +Before using Vagrant, make sure that Onionoo builds correctly on the host +system. +This may require running `git submodule init && git submodule update`, as +well as providing all required libraries. + +The given Vagrant file uses Version 2, i.e., a Vagrant installation +of version 1.1 or above is necessary. +The following was tested using 1.4.3 and VirtualBox 4.3.14. +(Wheezy stable only provides 1.0.3, Jessie provides 1.4.3) + +Local changes to the Vagrantfile: +Tell Vagrant how much memory the virtual machine may use, i.e., change + +``` +vb.memory = 4096 +``` + +to some value that makes sense on your machine. +Rule of thumb: less than half the RAM, but as much as you want to spare. + +Create a Debian Wheezy 64 bit instance: + +``` +vagrant up +``` + +This command downloads the virtual machine imagine, unless it has been +downloaded before, creates a new virtual machine, and runs the bootstrap +script in `vagrant/bootstrap.sh`. This may take a few minutes. + +Once this is all done, log into the virtual machine and change to the +Onionoo working directory: + +``` +vagrant ssh +cd /srv/onionoo.torproject.org/onionoo/ +``` + +Important: better avoid runninng Ant in the `/vagrant/` directory (which +is shared with the host), or the guest system will write directly to the +host system, which performs not really well. + +Read the INSTALL file and make the appropriate changes to adapt everything +to your setup, e.g., memory settings. +Compile Onionoo, run the unit tests and then the cron part of it: + +``` +ant compile +ant test +ant run +``` + +This step may take an hour or more. Onionoo downloads the last three days +of Tor descriptors, which is about 2 GiB, and processes them. + +Once these steps are done, deploy the servlet to the local Tomcat server: + +``` +ant war +``` + +Test the Onionoo service using a browser on the host (port 8080 on the +guest is forwarded to the host). Sample URL: + +http://localhost:8080/onionoo/summary?limit=2 + +Note that Tomcat's default server.xml needs no changing for running in the +development environment. +See the INSTALL file for necessary changes in the production environment. + +## Documentation overview + +Onionoo needs documentation for users, service operators, and potential +contributors. + +Users in this case are not so much end users, but developers of Onionoo +clients; +end users of Onionoo clients should refer to those clients' +documentation. +Service operators are people who run a public Onionoo server. +Potential contributors are developers who consider writing code for the +Onionoo server itself. + +This document outlines what documentation exists or should exist for +Onionoo. + +### Documentation for users + +Most Onionoo users who are interested in reading its documentation are +developers who write an Onionoo client. +In addition to that there are a smaller number of people who read user +documentation to query Onionoo directly rather than using one of the +available Onionoo clients. +But for the purpose of this document, most users are interested in reading +documentation of the RESTful API that Onionoo provides, but they don't +care much about its Java sources. + +#### Overview + +The starting point for every user and even every potential contributor is +the overview page. +It describes what Onionoo is, lists known Onionoo clients, and points to +available documentation for users and potential contributors. +The product overview must be easily accessible, which is why it is +available via `https://onionoo.torproject.org/`. + +The sources of the product overview are available in `web/index.html`. + +#### Getting Started guide + +New users of the RESTful API may find it overwhelming to read through the +protocol specification before making their first request. +A tutorial or Getting Started guide would get these users up to speed +within 5 or 10 minutes by suggesting some easy requests to make and refine +towards getting a desired result. + +There is a small Getting Started guide available at the bottom of +`web/protocol.html`. Maybe it's too well hidden, but it's a start. + +#### Protocol specification + +Once a user knows what Onionoo provides, they can read up the details in +its protocol specification. +This document tells them what requests they can make and how to interpret +responses. +Ideally, the protocol specification makes it unnecessary to read up +further documentation of Tor descriptors. +A positive side effect of making Onionoo's protocol specification as +precise as possible is that Onionoo client developers are in a better +position to make the documentation of Onionoo clients more useful for +their users. + +The sources of the protocol specification can be found in +`web/protocol.html`. + +### Documentation for service operators + +A service operator is a person who wants to deploy the Onionoo server. +That person wouldn't have to understand the inner workings of the Onionoo +code, but would know enough about it to set it up and handle common +problems. + +#### Deployment Guide + +The Deployment Guide explains how to set up a production environment for +running the Onionoo server and how to deploy Onionoo into it. + +There is a somewhat outdated Deployment Guide available in the `INSTALL` +file. +It should be updated, moved to a documentation subdirectory, and linked +from the README file. + +### Documentation for potential contributors + +A potential contributor is a person who knows what Onionoo provides and +who wants to help write code (or documentation) for the Onionoo server. + +#### README + +The README (or README.md) file is the starting point for understanding +what's in the source tree. +It should contain a short description of what Onionoo is, in case the +source tree is the first time the reader gets in touch with Onionoo, +rather than the overview page. +The README file should guide the reader by telling them which document to +read next for what aspect of the Onionoo sources. + +#### FAQ + +FAQs might be useful for things like: + + - Maven vs. Ant: Maven has its own package manager, Ant lets us use +Debian packages; + - why are certain Java libraries not up-to-date: most recent version +shipped with Debian stable; + - which Java libraries could be used for Onionoo development: whatever is +in Debian stable, but be sure to ask first; + +#### Design document + +The design document specifies the operation of the Onionoo server without +requiring any knowledge of its source code. +The existing design document in `DESIGN` was written as part of a (failed) +project to port Onionoo from Java to Python. +This file is now outdated, and maybe should rather be deleted than +updated. +The way how Onionoo operates can also be explained as part of the source +code documentation. + +#### Source code overview + +A potential contributor shouldn't be forced to read through source code +files to understand how these (compiled) files interact with each other. +There should be an overview of the source code that guides the developer +where to start reading. + +There is currently no such documentation available, but it may be possible +to write it using JavaDoc's `package-info.java` and have it integrated +into the generated JavaDoc output (which doesn't exist yet). + +#### Source code documentation + +Documenting the source code itself makes it easier for a potential +contributor to understand what it's doing. +Source code can be documented using JavaDoc comments for inclusion in the +generated JavaDoc output, or using non-JavaDoc comments to be read +together with the source code. +There should be JavaDoc comments for all interfaces and public methods. +The soon-to-be-available client API could try to provide that from +scratch. + +There is currently little source code documentation in Onionoo, simply +because the code is self-explanatory! +More seriously, this needs fixing. + +#### Contributor Guide + +The Contributor Guide would tell potential contributors how to write, +test, and submit patches. +This includes setting up a suitable development environment using Vagrant, +writing code that conforms to the code style guidelines, up to writing +useful commit messages and coming up with a good Git history. + +There is currently no Contributor Guide for Onionoo, but it would be very +useful to have one. +Once it exists it should live in the documentation subdirectory (which +doesn't exist yet). + +#### Coding Rules + +A Coding Rules document would contain: + + - naming rules for variables and methods, + - JavaDoc conventions, + - big _NO_ to uses of `System.out` and `System.err` (as soon as logging +is in place), + - rules about when to use external APIs, + - etc. + +This document might refer to some standard Java coding guides for +defaults. + +#### Documentation overview + +Last but not least, this document should be part of Onionoo's +documentation. +The purpose is that contributors know what documentation exists, or should +not exist, and why. + diff --git a/HOWTO-VAGRANT.md b/HOWTO-VAGRANT.md deleted file mode 100644 index 2cac164..0000000 --- a/HOWTO-VAGRANT.md +++ /dev/null @@ -1,73 +0,0 @@ -How to use Vagrant to build and test Onionoo -============================================ - -Before using Vagrant, make sure that Onionoo builds correctly on the host -system. -This may require running `git submodule init && git submodule update`, as -well as providing all required libraries. - -The given Vagrant file uses Version 2, i.e., a Vagrant installation -of version 1.1 or above is necessary. -The following was tested using 1.4.3 and VirtualBox 4.3.14. -(Wheezy stable only provides 1.0.3, Jessie provides 1.4.3) - -Local changes to the Vagrantfile: -Tell Vagrant how much memory the virtual machine may use, i.e., change - -``` -vb.memory = 4096 -``` - -to some value that makes sense on your machine. -Rule of thumb: less than half the RAM, but as much as you want to spare. - -Create a Debian Wheezy 64 bit instance: - -``` -vagrant up -``` - -This command downloads the virtual machine imagine, unless it has been -downloaded before, creates a new virtual machine, and runs the bootstrap -script in `vagrant/bootstrap.sh`. This may take a few minutes. - -Once this is all done, log into the virtual machine and change to the -Onionoo working directory: - -``` -vagrant ssh -cd /srv/onionoo.torproject.org/onionoo/ -``` - -Important: better avoid runninng Ant in the `/vagrant/` directory (which -is shared with the host), or the guest system will write directly to the -host system, which performs not really well. - -Read the INSTALL file and make the appropriate changes to adapt everything -to your setup, e.g., memory settings. -Compile Onionoo, run the unit tests and then the cron part of it: - -``` -ant compile -ant test -ant run -``` - -This step may take an hour or more. Onionoo downloads the last three days -of Tor descriptors, which is about 2 GiB, and processes them. - -Once these steps are done, deploy the servlet to the local Tomcat server: - -``` -ant war -``` - -Test the Onionoo service using a browser on the host (port 8080 on the guest -is forwarded to the host). Sample URL: - -http://localhost:8080/onionoo/summary?limit=2 - -Note that Tomcat's default server.xml needs no changing for running in the -development environment. -See the INSTALL file for necessary changes in the production environment. - diff --git a/README.md b/README.md new file mode 100644 index 0000000..df71660 --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# Onionoo + +Onionoo is a web-based protocol to learn about currently running Tor +relays and bridges. Onionoo itself was not designed as a service for +human beings---at least not directly. Onionoo provides the data for other +applications and websites which in turn present Tor network status +information to humans. + +Onionoo _users_ should head over to `https://onionoo.torproject.org/` to +learn more about using Onionoo. + +Onionoo _service operators_ should read `INSTALL`. + +Onionoo _contributors_ should start reading `CONTRIB.md` and, once it's +available, run `ant doc` and read the generated JavaDocs. +

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 12 Sep '14

12 Sep '14

commit 1521b7a4bbc144595b8a747d5a5560cbd6339375 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 12 17:15:39 2014 +0000 Update translations for abouttor-homepage --- hi/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hi/aboutTor.dtd b/hi/aboutTor.dtd index 4aa7273..70637bc 100644 --- a/hi/aboutTor.dtd +++ b/hi/aboutTor.dtd @@ -16,7 +16,7 @@ <!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> <!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> +<!ENTITY aboutTor.failure2.label "इस ब्राउज़र इ टॉर काम नहीं कर रहा"> <!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label ".">

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 12 Sep '14

12 Sep '14

commit 861c49959470afbda7964c7f7d555db1c8cb9270 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 12 17:15:27 2014 +0000 Update translations for mat-gui --- hi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi.po b/hi.po index cb7df98..118e0da 100644 --- a/hi.po +++ b/hi.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-09-12 16:39+0000\n" +"PO-Revision-Date: 2014-09-12 16:46+0000\n" "Last-Translator: Gyanendra Giri <bhimgiri(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ msgstr "" #: mat-gui:181 msgid "Website" -msgstr "" +msgstr "वेबसाइट" #: mat-gui:207 data/mat.ui:107 msgid "Preferences"

1 0