- tor-commits - lists.torproject.org

[tor/master] Suppress "decided to publish new descriptor" message when not a server
by nickm＠torproject.org 03 Apr '12

03 Apr '12

commit 6a9e693fbe5fc7c418e1c187b34a1496b62544cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 2 18:54:16 2012 -0400 Suppress "decided to publish new descriptor" message when not a server The message only means that we're publishing a new descriptor when we are actually in some kind of server mode, and publication is on. Fix for bug 3942; bugfix on 0.2.3.2-alpha. --- changes/bug3942 | 4 ++++ src/or/router.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug3942 b/changes/bug3942 new file mode 100644 index 0000000..f69c7bc --- /dev/null +++ b/changes/bug3942 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Don't log that we have "decided to publish new relay descriptor" unless + we are actually publishing a descriptor. Fix for bug 3942; bugfix on + 0.2.3.2-alpha. diff --git a/src/or/router.c b/src/or/router.c index bf15689..eb201f4 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1738,8 +1738,10 @@ mark_my_descriptor_dirty_if_too_old(time_t now) void mark_my_descriptor_dirty(const char *reason) { + const or_options_t *options = get_options(); + if (server_mode(options) && options->_PublishServerDescriptor) + log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason); desc_clean_since = 0; - log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason); if (!desc_dirty_reason) desc_dirty_reason = reason; }

1 0

[onionoo/master] A consensus weight of 0 is still valid.
by karsten＠torproject.org 03 Apr '12

03 Apr '12

commit 1f18ac65e8f1bf55aa9e65ccbb11a9652bae1aad Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 3 13:59:14 2012 +0200 A consensus weight of 0 is still valid. --- src/org/torproject/onionoo/DetailDataWriter.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index d107299..90c2160 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -367,7 +367,7 @@ public class DetailDataWriter { sb.append(",\n\"as_name\":\"" + StringEscapeUtils.escapeJavaScript(aSName) + "\""); } - if (consensusWeight > 0L) { + if (consensusWeight >= 0L) { sb.append(",\n\"consensus_weight\":" + String.valueOf(consensusWeight)); }

1 0

[onionoo/master] Add Commons Compress to build path.
by karsten＠torproject.org 03 Apr '12

03 Apr '12

commit 425a074e202541b9fd7964ac2a1ec360d51182ca Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 3 13:13:21 2012 +0200 Add Commons Compress to build path. This .jar is now required by metrics-lib. --- build.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build.xml b/build.xml index 878c07f..2cc64d0 100644 --- a/build.xml +++ b/build.xml @@ -15,6 +15,7 @@ <pathelement path="${classes}"/> <pathelement location="lib/commons-codec-1.4.jar"/> <pathelement location="lib/commons-lang-2.5.jar"/> + <pathelement location="lib/commons-compress-1.3.jar"/> <pathelement location="lib/servlet-api.jar"/> <pathelement location="lib/descriptor.jar"/> <pathelement location="lib/maxmindgeoip.jar"/>

1 0

[onionoo/master] Stop calling the changes from 1 month ago 'new.'
by karsten＠torproject.org 03 Apr '12

03 Apr '12

commit 8f33b102da5fd7d0e79018ccf39a1803b575a0c5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 3 13:11:25 2012 +0200 Stop calling the changes from 1 month ago 'new.' --- web/index.html | 78 ++++++++++++++++++++++++------------------------------- 1 files changed, 34 insertions(+), 44 deletions(-) diff --git a/web/index.html b/web/index.html index 8533962..848e416 100755 --- a/web/index.html +++ b/web/index.html @@ -113,11 +113,8 @@ have been running in the past week, but don't include any relays.</td> <tr> <td>GET summary/search/:searchtext</td> <td>Return summaries of all relays and bridges with :searchtext -matching the beginning of a nickname, (possibly -$-prefixed) fingerprint, IP address, or (possibly $-prefixed) hashed fingerprint. -Added the option to search for $-prefixed (hashed) fingerprints on -February 25, 2012. +matching the beginning of a nickname, (possibly $-prefixed) fingerprint, +IP address, or (possibly $-prefixed) hashed fingerprint. Searches are case-insensitive. Full fingerprints should always be hashed using SHA-1, regardless of searching for a relay or a bridge, in order to not @@ -183,43 +180,41 @@ GeoIP database by resolving the relay's first onion-routing IP address. Optional field. Omitted if the relay IP address could not be found in the GeoIP database.</li> -<li>"country_name": Country name as found -in a GeoIP database by resolving the relay's first onion-routing IP -address. +<li>"country_name": Country name as found in a GeoIP database by +resolving the relay's first onion-routing IP address. Optional field. -Omitted if the relay IP address could not be found in the GeoIP database. -Added on February 28, 2012.</li> -<li>"region_name": Region name as found -in a GeoIP database by resolving the relay's first onion-routing IP -address. +Omitted if the relay IP address could not be found in the GeoIP +database.</li> +<li>"region_name": Region name as found in a GeoIP database by +resolving the relay's first onion-routing IP address. Optional field. -Omitted if the relay IP address could not be found in the GeoIP database. -Added on February 28, 2012.</li> -<li>"city_name": City name as found in a +Omitted if the relay IP address could not be found in the GeoIP +database.</li> +<li>"city_name": City name as found in a GeoIP database by resolving the relay's first onion-routing IP address. Optional field. -Omitted if the relay IP address could not be found in the GeoIP database. -Added on February 28, 2012.</li> -<li>"latitude": Latitude as found in a -GeoIP database by resolving the relay's first onion-routing IP address. +Omitted if the relay IP address could not be found in the GeoIP +database.</li> +<li>"latitude": Latitude as found in a GeoIP database by resolving +the relay's first onion-routing IP address. Optional field. -Omitted if the relay IP address could not be found in the GeoIP database. -Added on February 11, 2012.</li> -<li>"longitude": Longitude as found in a -GeoIP database by resolving the relay's first onion-routing IP address. +Omitted if the relay IP address could not be found in the GeoIP +database.</li> +<li>"longitude": Longitude as found in a GeoIP database by +resolving the relay's first onion-routing IP address. Optional field. -Omitted if the relay IP address could not be found in the GeoIP database. -Added on February 11, 2012.</li> -<li>"as_number": AS number as found in an -AS database by resolving the relay's first onion-routing IP address. +Omitted if the relay IP address could not be found in the GeoIP +database.</li> +<li>"as_number": AS number as found in an AS database by +resolving the relay's first onion-routing IP address. Optional field. -Omitted if the relay IP address could not be found in the AS database. -Added on February 28, 2012.</li> -<li>"as_name": AS name as found in an AS -database by resolving the relay's first onion-routing IP address. +Omitted if the relay IP address could not be found in the AS +database.</li> +<li>"as_name": AS name as found in an AS database by resolving the +relay's first onion-routing IP address. Optional field. -Omitted if the relay IP address could not be found in the AS database. -Added on February 28, 2012.</li> +Omitted if the relay IP address could not be found in the AS +database.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. Optional field. @@ -332,11 +327,8 @@ been running in the past week, but don't include any relays.</td> <tr> <td>GET details/search/:searchtext</td> <td>Return details of all relays and bridges with :searchtext -matching the beginning of a nickname, (possibly -$-prefixed) fingerprint, IP address, or (possibly $-prefixed) hashed fingerprint. -Added the option to search for $-prefixed (hashed) fingerprints on -February 25, 2012. +matching the beginning of a nickname, (possibly $-prefixed) fingerprint, +IP address, or (possibly $-prefixed) hashed fingerprint. Searches are case-insensitive. Full fingerprints should always be hashed using SHA-1, regardless of searching for a relay or a bridge, in order to not @@ -478,11 +470,9 @@ relays.</td> <tr> <td>GET details/search/:searchtext</td> <td>Return bandwidth documents of all relays and bridges with -:searchtext matching the beginning of a nickname, (possibly $-prefixed) fingerprint, IP address, or -(possibly $-prefixed) hashed fingerprint. -Added the option to search for $-prefixed (hashed) fingerprints on -February 25, 2012. +:searchtext matching the beginning of a nickname, (possibly +$-prefixed) fingerprint, IP address, or (possibly $-prefixed) hashed +fingerprint. Searches are case-insensitive. Full fingerprints should always be hashed using SHA-1, regardless of searching for a relay or a bridge, in order to not

1 0

[onionoo/master] Add consensus_weight field to relay details.
by karsten＠torproject.org 03 Apr '12

03 Apr '12

commit ba812299c1569989cc0f20a34491ceedf95ba233 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 3 13:24:51 2012 +0200 Add consensus_weight field to relay details. --- src/org/torproject/onionoo/CurrentNodes.java | 26 ++++++++++++++------- src/org/torproject/onionoo/DetailDataWriter.java | 5 ++++ src/org/torproject/onionoo/Node.java | 7 +++++- web/index.html | 6 +++++ 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 6c3798b..5732cb9 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -67,8 +67,13 @@ public class CurrentNodes { int dirPort = Integer.parseInt(parts[7]); SortedSet<String> relayFlags = new TreeSet<String>( Arrays.asList(parts[8].split(","))); + long consensusWeight = -1L; + if (parts.length > 9) { + consensusWeight = Long.parseLong(parts[9]); + } this.addRelay(nickname, fingerprint, address, - validAfterMillis, orPort, dirPort, relayFlags); + validAfterMillis, orPort, dirPort, relayFlags, + consensusWeight); } else if (line.startsWith("b ")) { String[] parts = line.split(" "); if (parts.length < 9) { @@ -128,9 +133,11 @@ public class CurrentNodes { sb.append("," + relayFlag); } String relayFlags = sb.toString().substring(1); + String consensusWeight = String.valueOf( + entry.getConsensusWeight()); bw.write("r " + nickname + " " + fingerprint + " " + address + " " + validAfter + " " + orPort + " " + dirPort + " " + relayFlags - + "\n"); + + " " + consensusWeight + "\n"); } for (Node entry : this.currentBridges.values()) { String fingerprint = entry.getFingerprint(); @@ -146,7 +153,7 @@ public class CurrentNodes { String relayFlags = sb.toString().substring(1); bw.write("b Unnamed " + fingerprint + " " + address + " " + published + " " + orPort + " " + dirPort + " " + relayFlags - + "\n"); + + " -1\n"); } bw.close(); } catch (IOException e) { @@ -175,8 +182,8 @@ public class CurrentNodes { if (descriptorFile.getDescriptors() != null) { for (Descriptor descriptor : descriptorFile.getDescriptors()) { if (descriptor instanceof RelayNetworkStatusConsensus) { - updateRelayNetworkStatusConsensus((RelayNetworkStatusConsensus) - descriptor); + updateRelayNetworkStatusConsensus( + (RelayNetworkStatusConsensus) descriptor); } } } @@ -203,20 +210,21 @@ public class CurrentNodes { int orPort = entry.getOrPort(); int dirPort = entry.getDirPort(); SortedSet<String> relayFlags = entry.getFlags(); + long consensusWeight = entry.getBandwidth(); this.addRelay(nickname, fingerprint, address, validAfterMillis, - orPort, dirPort, relayFlags); + orPort, dirPort, relayFlags, consensusWeight); } } public void addRelay(String nickname, String fingerprint, String address, long validAfterMillis, int orPort, int dirPort, - SortedSet<String> relayFlags) { + SortedSet<String> relayFlags, long consensusWeight) { if (validAfterMillis >= cutoff && (!this.currentRelays.containsKey(fingerprint) || this.currentRelays.get(fingerprint).getLastSeenMillis() < validAfterMillis)) { Node entry = new Node(nickname, fingerprint, address, - validAfterMillis, orPort, dirPort, relayFlags); + validAfterMillis, orPort, dirPort, relayFlags, consensusWeight); this.currentRelays.put(fingerprint, entry); if (validAfterMillis > this.lastValidAfterMillis) { this.lastValidAfterMillis = validAfterMillis; @@ -322,7 +330,7 @@ public class CurrentNodes { this.currentBridges.get(fingerprint).getLastSeenMillis() < publishedMillis)) { Node entry = new Node("Unnamed", fingerprint, address, - publishedMillis, orPort, dirPort, relayFlags); + publishedMillis, orPort, dirPort, relayFlags, -1L); this.currentBridges.put(fingerprint, entry); if (publishedMillis > this.lastPublishedMillis) { this.lastPublishedMillis = publishedMillis; diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index c18f7d2..d107299 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -321,6 +321,7 @@ public class DetailDataWriter { String cityName = entry.getCityName(); String aSNumber = entry.getASNumber(); String aSName = entry.getASName(); + long consensusWeight = entry.getConsensusWeight(); StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" + "\"nickname\":\"" + nickname + "\",\n" @@ -366,6 +367,10 @@ public class DetailDataWriter { sb.append(",\n\"as_name\":\"" + StringEscapeUtils.escapeJavaScript(aSName) + "\""); } + if (consensusWeight > 0L) { + sb.append(",\n\"consensus_weight\":" + + String.valueOf(consensusWeight)); + } /* Add exit addresses if at least one of them is distinct from the * onion-routing addresses. */ diff --git a/src/org/torproject/onionoo/Node.java b/src/org/torproject/onionoo/Node.java index ad26746..3daa4be 100644 --- a/src/org/torproject/onionoo/Node.java +++ b/src/org/torproject/onionoo/Node.java @@ -22,10 +22,11 @@ public class Node { private int orPort; private int dirPort; private SortedSet<String> relayFlags; + private long consensusWeight; private boolean running; public Node(String nickname, String fingerprint, String address, long lastSeenMillis, int orPort, int dirPort, - SortedSet<String> relayFlags) { + SortedSet<String> relayFlags, long consensusWeight) { this.nickname = nickname; this.fingerprint = fingerprint; this.address = address; @@ -33,6 +34,7 @@ public class Node { this.orPort = orPort; this.dirPort = dirPort; this.relayFlags = relayFlags; + this.consensusWeight = consensusWeight; } public String getFingerprint() { return this.fingerprint; @@ -103,6 +105,9 @@ public class Node { public SortedSet<String> getRelayFlags() { return this.relayFlags; } + public long getConsensusWeight() { + return this.consensusWeight; + } public void setRunning(boolean running) { this.running = running; } diff --git a/web/index.html b/web/index.html index 848e416..c4c154c 100755 --- a/web/index.html +++ b/web/index.html @@ -215,6 +215,12 @@ relay's first onion-routing IP address. Optional field. Omitted if the relay IP address could not be found in the AS database.</li> +<li>"consensus_weight": Bandwidth weight +assigned to this relay by the directory authorities. +The unit is arbitrary; currently it's kilobytes per second, but that might +change in the future. +Required field. +Added on April 3, 2012.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. Optional field.

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 03 Apr '12

03 Apr '12

commit 35d45d96f89a8cd755f72188974cae388939142c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 3 10:15:05 2012 +0000 Update translations for orbot --- values-eu/strings.xml | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/values-eu/strings.xml b/values-eu/strings.xml index c72e025..e7455ee 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -33,20 +33,20 @@ <string name="menu_exit">Irten</string> <string name="powered_by">Tor Projectek indartua</string> <string name="press_to_start">- sakatu luze hasteko -</string> - <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> - <string name="pref_trans_proxy_title">Transparent Proxying</string> - <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> - <string name="pref_transparent_all_title">Tor Everything</string> - <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> + <string name="pref_trans_proxy_group">Proxyatze Gardena (Root behar du)</string> + <string name="pref_trans_proxy_title">Proxyatze Gardena</string> + <string name="pref_trans_proxy_summary">Aplikazioen Torifikatze Automatikoa</string> + <string name="pref_transparent_all_title">Tor-tu Dena</string> + <string name="pref_transparent_all_summary">Aplikazio guztien trafikoa Tor bidez proxyatu</string> <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> <string name="pref_transparent_port_title">Portu Zerrenda</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> - <string name="pref_transparent_port_dialog">Enter ports to proxy</string> + <string name="pref_transparent_port_dialog">Sartu proxyatzeko portuak</string> <string name="pref_has_root">Root sarrera eskatu</string> - <string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="pref_has_root_summary">Root sarrera eskatu proxyatze gardenarentzat</string> <string name="status_install_success">Tor bitarrak zuzen instalatuta!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="status_install_fail">Tor fitxategi bitarrak ezin izan dira instalatu. Mesedez ikusi erregistroa eta jakinarazi tor-assistants(a)torproject.org</string> <string name="title_error">Aplikazio Akatsa</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">Orboti buruz</string> @@ -67,7 +67,7 @@ <string name="wizard_permission_enable_root">Root Orboti eman</string> <string name="wizard_configure">Torifikazioa Konfiguratu</string> <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> + <string name="wizard_configure_all">Aplikazio gustiak Tor bidez proxyatu</string> <string name="wizard_configure_select_apps">Hautatu Banakako Aplikazioak Torentzat</string> <string name="wizard_tips_tricks">Orbot-gaitutako Aplikazioak</string> <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> @@ -83,7 +83,7 @@ <string name="pref_hs_group">Ezkutuko Zerbitzuak</string> <string name="pref_general_group">Orokorra</string> <string name="pref_start_boot_title">Hasi Orbot Abiarazterakoan</string> - <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> + <string name="pref_start_boot_summary">Automatikoki Orbot hasi eta Tor konektatu zure Android gailua abiarazterakoan</string>   <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> @@ -106,7 +106,7 @@ <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/a…</string>-->  - <string name="wizard_transproxy_title">Transparent Proxying</string> + <string name="wizard_transproxy_title">Proxyatze Gardena</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> <string name="wizard_transproxy_none">Bat ere ez</string> @@ -134,12 +134,12 @@ <string name="status">Egoera</string> <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> - <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> + <string name="transparent_proxying_enabled">Proxyatze gardena GAITUTA</string> <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> - <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> + <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string> <string name="transproxy_rules_cleared">TransProxy rules cleared</string> - <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> - <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> + <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string> + <string name="privoxy_is_running_on_port_">Privoxy hurrengo portua exekutatzen ari da:</string> <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> <string name="bridge_error">Zubi Akatsa</string> <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> @@ -178,7 +178,7 @@ <string name="enter_ports">Portuak sartu</string> <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string> <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> - <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> + <string name="enter_localhost_ports_for_hidden_services">sartu localhost portuak ezkutuko zerbitzuentzat</string> <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> @@ -186,7 +186,7 @@ <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> <string name="the_tor_license">Tor Lizentzia</string> <string name="https_torproject_org">https://torproject.org</string> - <string name="third_party_software">3rd-Party-Software: </string> + <string name="third_party_software">3.-Ataleko-Softwarea:</string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> @@ -195,7 +195,7 @@ <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> - <string name="hidden_service_on">hidden service on:</string> + <string name="hidden_service_on">ezkutuko zerbitzua hemen:</string> <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string> <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</string>

1 0

[metrics-web/master] Add graph parameters back to filenames.
by karsten＠torproject.org 03 Apr '12

03 Apr '12

commit dd9f33b5b28e8700e15b5169c4652e4d61270780 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 3 08:46:58 2012 +0200 Add graph parameters back to filenames. Fixes #5555. --- .../torproject/ernie/web/GraphImageServlet.java | 10 +++++----- src/org/torproject/ernie/web/RObject.java | 18 ++++++++++++++++++ src/org/torproject/ernie/web/RObjectGenerator.java | 10 ++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/ernie/web/GraphImageServlet.java b/src/org/torproject/ernie/web/GraphImageServlet.java index 20d3297..88d5755 100644 --- a/src/org/torproject/ernie/web/GraphImageServlet.java +++ b/src/org/torproject/ernie/web/GraphImageServlet.java @@ -48,11 +48,11 @@ public class GraphImageServlet extends HttpServlet { /* Request graph from R object generator, which either returns it from * its cache or asks Rserve to generate it. */ - byte[] graphBytes = rObjectGenerator.generateGraph(requestedGraph, + RObject graph = rObjectGenerator.generateGraph(requestedGraph, request.getParameterMap(), true); /* Make sure that we have a graph to return. */ - if (graphBytes == null) { + if (graph == null || graph.getBytes() == null) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); return; } @@ -61,11 +61,11 @@ public class GraphImageServlet extends HttpServlet { BufferedOutputStream output = null; response.setContentType("image/png"); response.setHeader("Content-Length", - String.valueOf(graphBytes.length)); + String.valueOf(graph.getBytes().length)); response.setHeader("Content-Disposition", - "inline; filename=\"" + requestedGraph + ".png\""); + "inline; filename=\"" + graph.getFileName() + "\""); output = new BufferedOutputStream(response.getOutputStream(), 1024); - output.write(graphBytes, 0, graphBytes.length); + output.write(graph.getBytes(), 0, graph.getBytes().length); output.flush(); output.close(); } diff --git a/src/org/torproject/ernie/web/RObject.java b/src/org/torproject/ernie/web/RObject.java new file mode 100644 index 0000000..4ee5cdc --- /dev/null +++ b/src/org/torproject/ernie/web/RObject.java @@ -0,0 +1,18 @@ +/* Copyright 2011, 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.web; + +public class RObject { + private byte[] bytes; + private String fileName; + public RObject(byte[] bytes, String fileName) { + this.bytes = bytes; + this.fileName = fileName; + } + public String getFileName() { + return fileName; + } + public byte[] getBytes() { + return bytes; + } +} diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index 3482dce..005da85 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -137,7 +137,7 @@ public class RObjectGenerator implements ServletContextListener { /* Nothing to do. */ } - public byte[] generateGraph(String requestedGraph, Map parameterMap, + public RObject generateGraph(String requestedGraph, Map parameterMap, boolean checkCache) { Map<String, String[]> checkedParameters = GraphParameterChecker. getInstance().checkParameters(requestedGraph, parameterMap); @@ -172,7 +172,13 @@ public class RObjectGenerator implements ServletContextListener { String imageFilename = imageFilenameBuilder.toString(); rQueryBuilder.append("path = '%s')"); String rQuery = rQueryBuilder.toString(); - return this.generateGraph(rQuery, imageFilename, checkCache); + byte[] graphBytes = this.generateGraph(rQuery, imageFilename, + checkCache); + if (graphBytes != null) { + return new RObject(graphBytes, imageFilename); + } else { + return null; + } } /* Generate a graph using the given R query that has a placeholder for

1 0

r25595: {website} Providing a notice that the PathSupport project isn't ideal (website/trunk/getinvolved/en)
by Damian Johnson 02 Apr '12

02 Apr '12

Author: atagar Date: 2012-04-03 03:13:27 +0000 (Tue, 03 Apr 2012) New Revision: 25595 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Providing a notice that the PathSupport project isn't ideal for GSoC Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-04-02 18:36:15 UTC (rev 25594) +++ website/trunk/getinvolved/en/volunteer.wml 2012-04-03 03:13:27 UTC (rev 25595) @@ -888,6 +888,11 @@ be TorBEL.</li> </ol> + + Upon reflection this is not an especially good project for this year's GSoC. You are still perfectly wecome to apply for this project, but <a href="https://trac.torproject.org/projects/tor/wiki/doc/stem">other stem related tasks</a> such as implementing a general controller, descriptor fetching, and client migrations would be better. For the discussion that lead to this see <a href="http://archives.seul.org/or/dev/Apr-2012/msg00006.html">this thread</a>. + + </li> + <!-- <a id="orbot-userInterface"></a> <li>

1 0

[tor/master] Add a warning about settign a bridge in MyFamily
by nickm＠torproject.org 02 Apr '12

02 Apr '12

commit 42143979d8c594525583ea8de15abf18636f78b1 Author: Daniel 'koolfy' Faucon <koolfy(a)geekmx.org> Date: Sun Apr 1 15:36:13 2012 +0200 Add a warning about settign a bridge in MyFamily --- doc/tor.1.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bd67661..e73377b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1182,7 +1182,8 @@ is non-zero): their identity fingerprints or nicknames. When two servers both declare that they are in the same \'family', Tor clients will not use them in the same circuit. (Each server only needs to list the other servers in its - family; it doesn't need to list itself, but it won't hurt.) + family; it doesn't need to list itself, but it won't hurt.) Do not list + any bridge relay as it would compromise its concealment. **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19

1 0

[tor/master] Make it clear that bridges should not be set in MyFamily
by nickm＠torproject.org 02 Apr '12

02 Apr '12

commit 116dcf6ca99b39173c28e7ff910ef0ec1181393d Author: Daniel 'koolfy' Faucon <koolfy(a)geekmx.org> Date: Thu Mar 29 04:28:20 2012 +0200 Make it clear that bridges should not be set in MyFamily --- src/config/torrc.bridge.in | 2 ++ src/config/torrc.sample.in | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/config/torrc.bridge.in b/src/config/torrc.bridge.in index 6e77ecc..927c7bb 100644 --- a/src/config/torrc.bridge.in +++ b/src/config/torrc.bridge.in @@ -140,6 +140,8 @@ DirPort 9030 # what port to advertise for directory connections ## different networks. You declare it here so Tor clients can avoid ## using more than one of your relays in a single circuit. See ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers +## However, you should never include a bridge's fingerprint here, as it would +## break its concealability and potentionally reveal its IP/TCP address. #MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 1ea5d9f..17e3f0b 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -144,6 +144,8 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## different networks. You declare it here so Tor clients can avoid ## using more than one of your relays in a single circuit. See ## https://www.torproject.org/docs/faq#MultipleRelays +## However, you should never include a bridge's fingerprint here, as it would +## break its concealability and potentionally reveal its IP/TCP address. #MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first

1 0