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

[translation/orbot] Update translations for orbot
by translation＠torproject.org 31 May '12

31 May '12

commit 303570812ad59271c09e2890fec37aeffeee19b0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 31 11:45:05 2012 +0000 Update translations for orbot --- values-ms_MY/strings.xml | 213 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 213 insertions(+), 0 deletions(-) diff --git a/values-ms_MY/strings.xml b/values-ms_MY/strings.xml new file mode 100644 index 0000000..7941695 --- /dev/null +++ b/values-ms_MY/strings.xml @@ -0,0 +1,213 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <string name="app_name">Orbot</string> + <string name="internal_web_url">http://orbot/</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="control_permission_label">mula dan henti Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot telah dimulakan..</string> + <string name="status_activated">Bersambung ke rangkaian Tor</string> + <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string> + <string name="status_shutting_down">Orbot sedang ditutup</string> + <string name="tor_process_starting">Starting Tor client...</string> + <string name="tor_process_complete">complete.</string> + <string name="tor_process_waiting">waiting.</string> + <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string> + <string name="menu_home">Rumah</string> + <string name="menu_browse">Carian</string> + <string name="menu_settings">Tetapan</string> + <string name="menu_log">Log</string> + <string name="menu_info">Bantuan</string> + <string name="menu_apps">Apps</string> + <string name="menu_start">Mula</string> + <string name="menu_stop">Henti</string> + <string name="menu_about">Tentang</string> + <string name="menu_wizard">Wizard</string> + <string name="button_help">Bantuan</string> + <string name="button_close">Tutup</string> + <string name="button_about">Tentang</string> + <string name="button_clear_log">Padam Log</string> + <string name="menu_verify">Semak</string> + <string name="menu_exit">Keluar</string> + <string name="press_to_start">- Tekan lama untuk mulakan - </string> + <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string> + <string name="pref_trans_proxy_title">Proxy Telus</string> + <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string> + <string name="pref_transparent_all_title">Tor segalanya</string> + <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string> + <string name="pref_transparent_port_fallback_title">Port proxy undur</string> + <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string> + <string name="pref_transparent_port_title">Senarai Port</string> + <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string> + <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string> + <string name="pref_has_root">Minta Akses Root</string> + <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string> + <string name="status_install_success">Tor berjaya dipasang!</string> + <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants(a)torproject.org</string> + <string name="title_error">Ralat Aplikasi</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">Tentang Orbot</string> + <string name="btn_next">Seterusnya</string> + <string name="btn_back">Kembali</string> + <string name="btn_finish">Tamat</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Cancel</string> +  + <string name="wizard_details">Some Orbot Details</string> + <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> + <string name="wizard_permissions_root">Permission Granted</string> + <string name="wizard_permissions_stock">Orbot Permissions</string> + <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> + <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> + <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> + <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> + <string name="wizard_permission_enable_root">Grant Root for Orbot</string> + <string name="wizard_configure">Configure Torification</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_select_apps">Select Individual Apps for Tor</string> + <string name="wizard_tips_tricks">Orbot-enabled Apps</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> + <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> + <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> + <string name="wizard_proxy_help_info">Proxy Settings</string> + <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> + <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> +  + <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> + <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> + <string name="pref_hs_group">Hidden Services</string> + <string name="pref_general_group">General</string> + <string name="pref_start_boot_title">Start Orbot on Boot</string> + <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</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> +  + <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> +  + <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> + <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> + <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> +  + <string name="wizard_tips_title">Orbot-Enabled Apps</string> + <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> + <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +  +  + <string name="wizard_transproxy_title">Transparent Proxying</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">None</string> + <string name="pref_transparent_tethering_title">Tor Tethering</string> + <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> + <string name="button_grant_superuser">Minta Akses Superuser</string> + <string name="pref_select_apps">Pilih Aplikasi</string> + <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string> + <string name="pref_node_configuration">Konfigurasi Nod</string> + <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string> + <string name="pref_entrance_node">Nod Kemasukan</string> + <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string> + <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string> + <string name="pref_use_whispercore">Guna WhisperCore</string> + <string name="pref_use_whispercore_summary">Gunakan API NetFilter proprietari diperuntukkan oleh WhisperSystems (peranti yang dikehendaki dengan WhisperCore dipasang)</string> + <string name="pref_proxy_type_title">Jenis Proxy</string> + <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string> + <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string> + <string name="pref_proxy_host_title">Hos Proxy</string> + <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string> + <string name="pref_proxy_host_dialog">Enter Proxy Host</string> + <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_summary">Proxy server port</string> + <string name="pref_proxy_port_dialog">Enter Proxy port</string> + <string name="status">Status</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="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> + <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</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="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> + <string name="bridge_error">Bridge Error</string> + <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> + <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> + <string name="error">Error</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> + <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> + <string name="exit_nodes">Exit Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> + <string name="enter_exit_nodes">Enter Exit Nodes</string> + <string name="exclude_nodes">Exclude Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> + <string name="enter_exclude_nodes">Enter Exclude Nodes</string> + <string name="strict_nodes">Strict Nodes</string> + <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Use Bridges</string> + <string name="bridges_obfuscated">Obfuscated Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> + <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> + <string name="enter_bridge_addresses">Enter Bridge Addresses</string> + <string name="relays">Relays</string> + <string name="relaying">Relaying</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> + <string name="relay_port">Relay Port</string> + <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> + <string name="enter_or_port">Enter OR port</string> + <string name="relay_nickname">Relay nickname</string> + <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> + <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> + <string name="reachable_addresses">Reachable Addresses</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> + <string name="reachable_ports">Reachable ports</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> + <string name="enter_ports">Enter ports</string> + <string name="enable_hidden_services">Enable Hidden Services</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="hidden_service_ports">Hidden Service Ports</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> + <string name="project_home">Project Home(s): </string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">The Tor License</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">3rd-Party-Software: </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> + <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> + <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="unable_to_read_hidden_service_name">unable to read hidden service name</string> + <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="pref_use_sys_iptables_title">Use Default Iptables</string> + <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> + <string name="notification_using_bridges">Bridges enabled!</string> + <string name="default_bridges"/> + <string name="set_locale_title">Set Locale</string> + <string name="set_locale_summary">Choose the locale and language for Orbot</string> + <string name="wizard_locale_title">Choose Language</string> + <string name="wizard_locale_msg">Leave default or switch the current language</string> + <string name="powered_by">Dijana oleh Projek Tor</string> + <string name="btn_save_settings">Save Settings</string> +</resources>

1 0

[metrics-web/master] Next @type annotations contained in tarballs.
by karsten＠torproject.org 31 May '12

31 May '12

commit d26298d35890c54a87fc50e6c571809da702ed70 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 31 12:43:43 2012 +0200 Next @type annotations contained in tarballs. --- web/WEB-INF/formats.jsp | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 23e8874..9ac7741 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -85,8 +85,7 @@ are recent: <li><tt>@type bridge-server-descriptor 1.0</tt></li> <li><tt>@type bridge-extra-info 1.0</tt></li> <li><tt>@type torperf 1.0</tt></li> -<li><tt>@type bridge-pool-assignment -1.0</tt></li> +<li><tt>@type bridge-pool-assignment 1.0</tt></li> <li><tt>@type gettor 1.0</tt></li> <li><tt>@type tordnsel 1.0</tt></li> </ul>

1 0

[metrics-lib/master] Understand @type annotation in bridge pool assignments.
by karsten＠torproject.org 31 May '12

31 May '12

commit 71f473962f29ac98a41bddcd341c708f8d1451fb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 31 12:02:48 2012 +0200 Understand @type annotation in bridge pool assignments. --- .../torproject/descriptor/impl/DescriptorImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index a4f1613..00a4b16 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -58,7 +58,8 @@ public abstract class DescriptorImpl implements Descriptor { parsedDescriptors.addAll(ExtraInfoDescriptorImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("bridge-pool-assignment ") || + } else if (firstLines.startsWith("@type bridge-pool-assignment 1.") || + firstLines.startsWith("bridge-pool-assignment ") || firstLines.contains("\nbridge-pool-assignment ")) { parsedDescriptors.addAll(BridgePoolAssignmentImpl. parseDescriptors(rawDescriptorBytes,

1 0

[metrics-db/master] Add @type annotation to bridge pool assignment files.
by karsten＠torproject.org 31 May '12

31 May '12

commit a76ade4725ce884572f760a47d8dd19d5b6ce072 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 31 11:45:40 2012 +0200 Add @type annotation to bridge pool assignment files. --- .../ernie/db/BridgePoolAssignmentsProcessor.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java index c07b786..d03dcaf 100644 --- a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java +++ b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java @@ -110,6 +110,7 @@ public class BridgePoolAssignmentsProcessor { sanitizedAssignmentsFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( sanitizedAssignmentsFile)); + bw.write("@type bridge-pool-assignment 1.0\n"); bw.write(bridgePoolAssignmentLine + "\n"); for (String assignmentLine : sanitizedAssignments) { bw.write(assignmentLine + "\n");

1 0

[metrics-lib/master] Parse sanitized bridge descriptor version 1.0.
by karsten＠torproject.org 31 May '12

31 May '12

commit 1743e912c3347824e4fef05569bdb194a1e04a0e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 21 16:23:39 2012 +0200 Parse sanitized bridge descriptor version 1.0. --- .../descriptor/impl/BridgeNetworkStatusImpl.java | 32 ++++++++++++++++++- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 16 ++++++++++ .../descriptor/impl/ServerDescriptorImpl.java | 16 ++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index 09f2f86..581c6e5 100644 --- a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -4,6 +4,8 @@ package org.torproject.descriptor.impl; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Scanner; import java.util.TimeZone; import org.torproject.descriptor.BridgeNetworkStatus; @@ -21,6 +23,11 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl private void setPublishedMillisFromFileName(String fileName) throws DescriptorParseException { + if (this.publishedMillis != 0L) { + /* We already learned the publication timestamp from parsing the + * "published" line. */ + return; + } if (fileName.length() == "20000101-000000-4A0CCD2DDC7995083D73F5D667100C8A5831F16D". length()) { @@ -44,8 +51,29 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl protected void parseHeader(byte[] headerBytes) throws DescriptorParseException { - throw new DescriptorParseException("No directory header expected in " - + "bridge network status."); + Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); + while (s.hasNext()) { + String line = s.next(); + String[] parts = line.split(" "); + String keyword = parts[0]; + if (keyword.equals("published")) { + this.parsePublishedLine(line, parts); + } else if (this.failUnrecognizedDescriptorLines) { + throw new DescriptorParseException("Unrecognized line '" + line + + "' in bridge network status."); + } else { + if (this.unrecognizedLines == null) { + this.unrecognizedLines = new ArrayList<String>(); + } + this.unrecognizedLines.add(line); + } + } + } + + private void parsePublishedLine(String line, String[] parts) + throws DescriptorParseException { + this.publishedMillis = ParseHelper.parseTimestampAtIndex(line, parts, + 1, 2); } protected void parseDirSource(byte[] dirSourceBytes) diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index d8fbc8d..f6e0fd9 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -168,6 +168,8 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl this.parseBridgeStatsIpsLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("router-signature")) { this.parseRouterSignatureLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("router-digest")) { + this.parseRouterDigestLine(line, lineNoOpt, partsNoOpt); } else if (line.startsWith("-----BEGIN")) { skipCrypto = true; } else if (line.startsWith("-----END")) { @@ -573,7 +575,21 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl /* Not parsing crypto parts (yet). */ } + private void parseRouterDigestLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length != 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + this.extraInfoDigest = ParseHelper.parseTwentyByteHexString(line, + partsNoOpt[1]); + } + private void calculateDigest() throws DescriptorParseException { + if (this.extraInfoDigest != null) { + /* We already learned the descriptor digest of this bridge + * descriptor from a "router-digest" line. */ + return; + } try { String ascii = new String(this.getRawDescriptorBytes(), "US-ASCII"); String startToken = "extra-info "; diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 5237348..df3662f 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -125,6 +125,8 @@ public class ServerDescriptorImpl extends DescriptorImpl this.parseAllowSingleHopExitsLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("dircacheport")) { this.parseDircacheportLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("router-digest")) { + this.parseRouterDigestLine(line, lineNoOpt, partsNoOpt); } else if (line.startsWith("-----BEGIN")) { crypto = new StringBuilder(); crypto.append(line + "\n"); @@ -459,7 +461,21 @@ public class ServerDescriptorImpl extends DescriptorImpl this.dirPort = ParseHelper.parsePort(line, partsNoOpt[1]); } + private void parseRouterDigestLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length != 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + this.serverDescriptorDigest = ParseHelper.parseTwentyByteHexString( + line, partsNoOpt[1]); + } + private void calculateDigest() throws DescriptorParseException { + if (this.serverDescriptorDigest != null) { + /* We already learned the descriptor digest of this bridge + * descriptor from a "router-digest" line. */ + return; + } try { String ascii = new String(this.getRawDescriptorBytes(), "US-ASCII"); String startToken = "router ";

1 0

[tor/master] Raise thresholds for declaring bootstrapping complete.
by nickm＠torproject.org 31 May '12

31 May '12

commit 6757261e8f8b8b2f79a07122a2324654d5fbb1b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 12:09:00 2012 -0400 Raise thresholds for declaring bootstrapping complete. This patch changes the total serverdesc threshold from 25% to 75% and the exit threshold from 33% to 50%. The goal is to make initially constructed circuits less horrible, and to make initial less awful (since fetching directory information in parallel with whatever the user is trying to do can hurt their performance). Implements ticket 3196. --- changes/bug3196 | 7 +++++++ src/or/routerlist.c | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug3196 b/changes/bug3196 new file mode 100644 index 0000000..9321022 --- /dev/null +++ b/changes/bug3196 @@ -0,0 +1,7 @@ + o Minor features: + - Raise the threshold of server descriptors needed (75%) and exit + server descriptors needed (50%) before we will declare ourselves + bootstrapped. This will make clients declare completion a little + later, but makes the initially constructed circuits less weird + and less in conflict with directory connections. Fixes ticket + #3196. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a64b93f..528b30f 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4997,7 +4997,14 @@ update_router_have_minimum_dir_info(void) count_usable_descriptors(&num_exit_present, &num_exit_usable, consensus, options, now, options->ExitNodes, 1); - if (num_present < num_usable/4) { +/* What fraction of desired server descriptors do we need before we will + * build circuits? */ +#define FRACTION_USABLE_NEEDED .75 +/* What fraction of desired _exit_ server descriptors do we need before we + * will build circuits? */ +#define FRACTION_EXIT_USABLE_NEEDED .5 + + if (num_present < num_usable * FRACTION_USABLE_NEEDED) { tor_snprintf(dir_info_status, sizeof(dir_info_status), "We have only %d/%d usable %sdescriptors.", num_present, num_usable, using_md ? "micro" : ""); @@ -5010,7 +5017,7 @@ update_router_have_minimum_dir_info(void) num_present, using_md ? "micro" : "", num_present ? "" : "s"); res = 0; goto done; - } else if (num_exit_present < num_exit_usable / 3) { + } else if (num_exit_present < num_exit_usable * FRACTION_EXIT_USABLE_NEEDED) { tor_snprintf(dir_info_status, sizeof(dir_info_status), "We have only %d/%d usable exit node descriptors.", num_exit_present, num_exit_usable);

1 0

[tor/master] Merge remote-tracking branch 'public/bug3196'
by nickm＠torproject.org 31 May '12

31 May '12

commit 32d6acade8488e8f3b1a85585d5136bf9a8ca76f Merge: ffc21b6 6757261 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 01:02:27 2012 -0400 Merge remote-tracking branch 'public/bug3196' changes/bug3196 | 7 +++++++ src/or/routerlist.c | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Add __attribute__(format)s for our varargs printf/scanf wrappers
by nickm＠torproject.org 31 May '12

31 May '12

commit e28489467233bff4500a70f8a7b22e42ca3b3e68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 30 12:14:38 2012 -0400 Add __attribute__(format)s for our varargs printf/scanf wrappers It turns out that if you set the third argument of __attribute__(format) to 0, GCC and Clang will check the format argument without expecting to find variadic arguments. This is the correct behavior for vsnprintf, vasprintf, and vscanf. I'm hoping this will fix bug 5969 (a clang warning) by telling clang that the format argument to tor_vasprintf is indeed a format string. --- changes/bug5969_022 | 7 +++++++ src/common/compat.h | 5 +++-- src/common/util.h | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/changes/bug5969_022 b/changes/bug5969_022 new file mode 100644 index 0000000..57c8744 --- /dev/null +++ b/changes/bug5969_022 @@ -0,0 +1,7 @@ + o Minor bugfixes + - Fix a build warning with Clang 3.1 related to our use of vasprint. + Fix for bug 5969. Bugfix on 0.2.2.11-alpha. + + o Compilation improvements: + - Tell GCC and Clang to check for any errors in format strings passed + to the tor_v*(print|scan)f functions. diff --git a/src/common/compat.h b/src/common/compat.h index d2f1fd1..fc70caf 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -261,11 +261,12 @@ void tor_munmap_file(tor_mmap_t *handle) ATTR_NONNULL((1)); int tor_snprintf(char *str, size_t size, const char *format, ...) CHECK_PRINTF(3,4) ATTR_NONNULL((1,3)); int tor_vsnprintf(char *str, size_t size, const char *format, va_list args) - ATTR_NONNULL((1,3)); + CHECK_PRINTF(3,0) ATTR_NONNULL((1,3)); int tor_asprintf(char **strp, const char *fmt, ...) CHECK_PRINTF(2,3); -int tor_vasprintf(char **strp, const char *fmt, va_list args); +int tor_vasprintf(char **strp, const char *fmt, va_list args) + CHECK_PRINTF(2,0); const void *tor_memmem(const void *haystack, size_t hlen, const void *needle, size_t nlen) ATTR_PURE ATTR_NONNULL((1,3)); diff --git a/src/common/util.h b/src/common/util.h index b9db25c..d477156 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -211,7 +211,11 @@ const char *escaped(const char *string); struct smartlist_t; void wrap_string(struct smartlist_t *out, const char *string, size_t width, const char *prefix0, const char *prefixRest); -int tor_vsscanf(const char *buf, const char *pattern, va_list ap); +int tor_vsscanf(const char *buf, const char *pattern, va_list ap) +#ifdef __GNUC__ + __attribute__((format(scanf, 2, 0))) +#endif + ; int tor_sscanf(const char *buf, const char *pattern, ...) #ifdef __GNUC__ __attribute__((format(scanf, 2, 3)))

1 0

[tor/master] Fix more clang format-nonliteral warnings (bug 5969)
by nickm＠torproject.org 31 May '12

31 May '12

commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 30 19:57:02 2012 -0400 Fix more clang format-nonliteral warnings (bug 5969) --- src/common/log.c | 7 +++++++ src/or/control.c | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index ac98f13..f2999f4 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -137,6 +137,13 @@ static void close_log(logfile_t *victim); static char *domain_to_string(log_domain_mask_t domain, char *buf, size_t buflen); +static INLINE char *format_msg(char *buf, size_t buf_len, + log_domain_mask_t domain, int severity, const char *funcname, + const char *format, va_list ap, size_t *msg_len_out) + CHECK_PRINTF(6,0); +static void logv(int severity, log_domain_mask_t domain, const char *funcname, + const char *format, va_list ap) + CHECK_PRINTF(4,0); /** Name of the application: used to generate the message we write at the * start of each new log. */ diff --git a/src/or/control.c b/src/or/control.c index d6e6932..8aa4240 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -126,6 +126,13 @@ typedef int event_format_t; static void connection_printf_to_buf(control_connection_t *conn, const char *format, ...) CHECK_PRINTF(2,3); +static void send_control_event_impl(uint16_t event, event_format_t which, + const char *format, va_list ap) + CHECK_PRINTF(3,0); +static int control_event_status(int type, int severity, const char *format, + va_list args) + CHECK_PRINTF(3,0); + static void send_control_done(control_connection_t *conn); static void send_control_event(uint16_t event, event_format_t which, const char *format, ...) @@ -3918,6 +3925,7 @@ control_event_my_descriptor_changed(void) static int control_event_status(int type, int severity, const char *format, va_list args) { + char *user_buf = NULL; char format_buf[160]; const char *status, *sev; @@ -3949,13 +3957,15 @@ control_event_status(int type, int severity, const char *format, va_list args) log_warn(LD_BUG, "Unrecognized status severity %d", severity); return -1; } - if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s %s\r\n", - status, sev, format)<0) { + if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s\r\n", + status, sev)<0) { log_warn(LD_BUG, "Format string too long."); return -1; } + tor_vasprintf(&user_buf, format, args); - send_control_event_impl(type, ALL_FORMATS, format_buf, args); + send_control_event(type, ALL_FORMATS, "%s %s", format_buf, user_buf); + tor_free(user_buf); return 0; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 31 May '12

31 May '12

commit ffc21b653f08e3826867c14d44d6543d262bb417 Merge: fe68a80 3a9351b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 00:07:52 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' (For bug 5969 fix) changes/bug5969_022 | 7 +++++++ src/common/compat.h | 5 +++-- src/common/log.c | 7 +++++++ src/common/util.h | 6 +++++- src/or/control.c | 16 +++++++++++++--- 5 files changed, 35 insertions(+), 6 deletions(-) diff --cc src/common/compat.h index b0ef63b,fc70caf..7edd889 --- a/src/common/compat.h +++ b/src/common/compat.h @@@ -263,12 -265,13 +263,13 @@@ int tor_vsnprintf(char *str, size_t siz int tor_asprintf(char **strp, const char *fmt, ...) CHECK_PRINTF(2,3); - int tor_vasprintf(char **strp, const char *fmt, va_list args); + int tor_vasprintf(char **strp, const char *fmt, va_list args) + CHECK_PRINTF(2,0); const void *tor_memmem(const void *haystack, size_t hlen, const void *needle, - size_t nlen) ATTR_PURE ATTR_NONNULL((1,3)); + size_t nlen) ATTR_NONNULL((1,3)); static const void *tor_memstr(const void *haystack, size_t hlen, - const char *needle) ATTR_PURE ATTR_NONNULL((1,3)); + const char *needle) ATTR_NONNULL((1,3)); static INLINE const void * tor_memstr(const void *haystack, size_t hlen, const char *needle) {

1 0