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

[tor/maint-0.2.2] nickname, not identity fingerprint, will help more
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 04bf17c50c111e80d715e984b5b3a4ad8feb5e81 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:09:01 2012 -0500 nickname, not identity fingerprint, will help more --- src/or/dirvote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 2fd94ea..ab08fd0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2276,7 +2276,7 @@ networkstatus_add_detached_signatures(networkstatus_t *target, log_info(LD_DIR, "Adding signature from %s with %s", voter_identity, algorithm); log(severity, LD_DIR, "Added a signature for %s from %s.", - voter_identity, source); + target_voter->nickname, source); ++r; if (old_sig) { smartlist_remove(target_voter->sigs, old_sig);

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit af32ce7b6ab4a31d56124f26aaa0682bf4e95bd7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 16:15:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 9f6ca45..dc385df 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-08 15:28+0000\n" +"PO-Revision-Date: 2012-01-08 16:08+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3510,6 +3510,10 @@ msgid "" "port forwarding. If %1:%2 is not your correct IP address and server port, " "please check your relay's configuration." msgstr "" +"پورتِ سرورِ رله شما قابل دسترسی‌ توسط کاربران دیگر نیست. این ممکن از به این " +"دلیل باشد که کامپیوترِ شما پشت firewall قرار دارد یا اینکه به روتر وصل شده " +"است که لازم است پورت فرواردینگ کند. اگر \"%1:%2\" آدرسِ آی‌پی و پورتِ شما " +"نیست، لطفا تنظیمات رله خود را چک کنید." msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit 525a393a8bd497e45619056821263d04b054768f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 16:15:04 2012 +0000 Update translations for orbot --- values-el/strings.xml | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/values-el/strings.xml b/values-el/strings.xml index eb97a33..0032d9d 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -1,26 +1,26 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> - <string name="app_name"></string> - <string name="internal_web_url"></string> - <string name="default_web_url"></string> - <string name="secure_default_web_url"></string> - <string name="tor_check_api_url"></string> - <string name="control_permission_label"></string> - <string name="tor_proxy_service_process"></string> - <string name="status_starting_up"></string> - <string name="status_activated"></string> - <string name="status_disabled"></string> - <string name="status_shutting_down"></string> + <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">εκκίνηση και διακοπή Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Το Orbot ξεκινά</string> + <string name="status_activated">Συνδέθηκε στο δίκτυο Tor</string> + <string name="status_disabled">\"Το Orbot είναι Απενεργοποιημένο</string> + <string name="status_shutting_down">Το Orbot θα τερματίσει</string> <string name="tor_process_starting"></string> <string name="tor_process_complete"></string> <string name="tor_process_waiting"></string> - <string name="not_anonymous_yet"></string> - <string name="menu_home"></string> - <string name="menu_browse"></string> - <string name="menu_settings"></string> - <string name="menu_log"></string> - <string name="menu_info"></string> - <string name="menu_apps"></string> + <string name="not_anonymous_yet">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η κυκλοφορία σας δεν είναι ακόμη ανώνυμη! Ρυθμίστε τις εφαρμογές σας ώστε να χρησιμοποιούν ως πληρεξούσιο HTTP 127.0.0.1:8118 ή SOCKS5 127.0.0.1:9050</string> + <string name="menu_home">Αρχική</string> + <string name="menu_browse">Περιήγηση</string> + <string name="menu_settings">Ρυθμίσεις</string> + <string name="menu_log">Καταγραφή</string> + <string name="menu_info">Βοήθεια</string> + <string name="menu_apps">Εφαρμογές</string> <string name="menu_start"></string> <string name="menu_stop"></string> <string name="menu_about"></string>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit 689bbd6253d375c38fe501fef4f9a20e72c95373 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 15:45:14 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index e00f12c..9f6ca45 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-08 15:11+0000\n" +"PO-Revision-Date: 2012-01-08 15:28+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3493,15 +3493,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "پورتِ سرور قابل دسترسی‌ میببشد!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "پورت سرور رله شما از شبکهٔ TOR قابل دسترسی‌ می‌باشد." msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "پورتِ سرورِ شما از شبکه TOR قابل دسترسی‌ نیست!" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit 24722665eb1496d26a0b458dea0e1a800a5b063d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 15:45:03 2012 +0000 Update translations for orbot --- values-el/strings.xml | 186 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/values-el/strings.xml b/values-el/strings.xml new file mode 100644 index 0000000..eb97a33 --- /dev/null +++ b/values-el/strings.xml @@ -0,0 +1,186 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <string name="app_name"></string> + <string name="internal_web_url"></string> + <string name="default_web_url"></string> + <string name="secure_default_web_url"></string> + <string name="tor_check_api_url"></string> + <string name="control_permission_label"></string> + <string name="tor_proxy_service_process"></string> + <string name="status_starting_up"></string> + <string name="status_activated"></string> + <string name="status_disabled"></string> + <string name="status_shutting_down"></string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> + <string name="not_anonymous_yet"></string> + <string name="menu_home"></string> + <string name="menu_browse"></string> + <string name="menu_settings"></string> + <string name="menu_log"></string> + <string name="menu_info"></string> + <string name="menu_apps"></string> + <string name="menu_start"></string> + <string name="menu_stop"></string> + <string name="menu_about"></string> + <string name="menu_wizard"></string> + <string name="button_help"></string> + <string name="button_close"></string> + <string name="button_about"></string> + <string name="button_clear_log"></string> + <string name="menu_verify"></string> + <string name="menu_exit"></string> + <string name="powered_by"></string> + <string name="press_to_start"></string> + <string name="pref_trans_proxy_group"></string> + <string name="pref_trans_proxy_title"></string> + <string name="pref_trans_proxy_summary"></string> + <string name="pref_transparent_all_title"></string> + <string name="pref_transparent_all_summary"></string> + <string name="pref_transparent_port_fallback_title"></string> + <string name="pref_transparent_port_fallback_summary"></string> + <string name="pref_transparent_port_title"></string> + <string name="pref_transparent_port_summary"></string> + <string name="pref_transparent_port_dialog"></string> + <string name="pref_has_root"></string> + <string name="pref_has_root_summary"></string> + <string name="status_install_success"></string> + <string name="status_install_fail"></string> + <string name="title_error"></string> + <string name="wizard_title"></string> + <string name="wizard_btn_tell_me_more"></string> + <string name="btn_next"></string> + <string name="btn_back"></string> + <string name="btn_finish"></string> + <string name="btn_okay"></string> + <string name="btn_cancel"></string> + <string name="wizard_details"></string> + <string name="wizard_details_msg"></string> + <string name="wizard_permissions_root"></string> + <string name="wizard_permissions_stock"></string> + <string name="wizard_premissions_msg_root"></string> + <string name="wizard_permissions_msg_stock"></string> + <string name="wizard_permissions_no_root"></string> + <string name="wizard_permissions_consent"></string> + <string name="wizard_permission_enable_root"></string> + <string name="wizard_configure"></string> + <string name="wizard_configure_msg"></string> + <string name="wizard_configure_all"></string> + <string name="wizard_configure_select_apps"></string> + <string name="wizard_tips_tricks"></string> + <string name="wizard_tips_msg"></string> + <string name="wizard_tips_otrchat"></string> + <string name="wizard_tips_proxy"></string> + <string name="wizard_proxy_help_info"></string> + <string name="wizard_proxy_help_msg"></string> + <string name="wizard_final"></string> + <string name="wizard_final_msg"></string> + <string name="connect_first_time"></string> + <string name="tor_check"></string> + <string name="pref_hs_group"></string> + <string name="pref_general_group"></string> + <string name="pref_start_boot_title"></string> + <string name="pref_start_boot_summary"></string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb"></string> + <string name="orweb_apk_url"></string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> +</resources>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit 8d2c4ff5cc2471ffdb3a42250064ba6673c5f36f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 15:15:22 2012 +0000 Update translations for vidalia_help --- el_GR/bridges.po | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/el_GR/bridges.po b/el_GR/bridges.po index e57b18a..817b938 100644 --- a/el_GR/bridges.po +++ b/el_GR/bridges.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-01-07 18:14+0000\n" +"PO-Revision-Date: 2012-01-08 15:12+0000\n" "Last-Translator: anvo <fragos.george(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -107,6 +107,16 @@ msgid "" "attacker to learn lots of bridge addresses, you must send this request from " "a Gmail account." msgstr "" +"Μπορείτε να βρείτε διευθύνσεις δημόσιων γεφυρών στον ιστότοπο " +"https://bridges.torproject.org. Οι απαντήσεις που θα παρετε από αυτή " +"τη σελίδα θα αλλάζουν κάθε λίγες ημέρες, γι' αυτό να ελέγχετε την σελίδα " +"αυτή περιοδικά αν χρειάζεστε περισσότερες διευθύνσεις γεφυρών. Ένας άλλος " +"τρόπος για να βρείτε διευθύνσεις δημόσιων γεφυρών είναι με την αποστολή " +"ηλεκτρονικού μηνύματος αλληλογραφίας στην διεύθυνση " +"bridges(a)torproject.org με την ένδειξη get bridges στο σώμα του" +" μηνύματος. Εντούτοις, και για να δυσκολεύονται οι επιτιθέμενοι να μάθουν " +"πολλές διευθύνσεις γεφυρών, πρέπει να στείλετε το αίτημα αυτό μέσα από έναν " +"λογαριασμό Gmail." #. type: Content of: <html><body> #: en/bridges.html:63 @@ -114,5 +124,8 @@ msgid "" "Configuring more than one bridge address will make your Tor connection more " "stable, in case some of the bridges become unreachable." msgstr "" +"Ρυθμίζοντας περισσότερες της μιας διευθύνσεις γεφυρών η σύνδεσή σας στο " +"δίκτυο Tor θα είναι σταθερότερη σε περίπτωση που κάποια από τις γέφυρες δεν " +"είναι προσβάσιμη."

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit 17da7814b758b4855144c83b9b34973ed9998c80 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 15:15:14 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index c6bcce1..e00f12c 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-08 14:11+0000\n" +"PO-Revision-Date: 2012-01-08 15:11+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3480,7 +3480,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "چک کردن برای در دسترس بودن پورتِ سرور" msgctxt "StatusEventWidget" msgid "" @@ -3488,6 +3488,8 @@ msgid "" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." msgstr "" +"TOR در حال تشخیص قابلیت دسترسیِ پورتِ سرور از درون شبکه TOR از طریق اتصال به خود در \"%1:%2\" می‌باشد. \n" +"این پروسه چند دقیقه طول می‌کشد." msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!"

1 0

[tor/maint-0.2.2] tell me who votes are actually for, not just where they're from
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 78e95b7b713c15b40303d63b96dbf9a8070b6cf7 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 10:03:46 2012 -0500 tell me who votes are actually for, not just where they're from --- src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/test/test_dir.c | 12 ++++++++---- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c6ce9f6..2fd94ea 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -35,10 +35,13 @@ typedef struct pending_consensus_t { static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, + const char *source, const char **msg_out); static int dirvote_add_signatures_to_pending_consensus( pending_consensus_t *pc, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out); static char *list_v3_auth_ids(void); static void dirvote_fetch_missing_votes(void); @@ -2168,6 +2171,8 @@ networkstatus_compute_consensus(smartlist_t *votes, int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out) { int r = 0; @@ -2270,6 +2275,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target, if (sig->good_signature || !old_sig || old_sig->bad_signature) { log_info(LD_DIR, "Adding signature from %s with %s", voter_identity, algorithm); + log(severity, LD_DIR, "Added a signature for %s from %s.", + voter_identity, source); ++r; if (old_sig) { smartlist_remove(target_voter->sigs, old_sig); @@ -3198,7 +3205,8 @@ dirvote_compute_consensuses(void) SMARTLIST_FOREACH(pending_consensus_signature_list, char *, sig, { const char *msg = NULL; - int r = dirvote_add_signatures_to_all_pending_consensuses(sig, &msg); + int r = dirvote_add_signatures_to_all_pending_consensuses(sig, + "pending", &msg); if (r >= 0) n_sigs += r; else @@ -3240,6 +3248,8 @@ static int dirvote_add_signatures_to_pending_consensus( pending_consensus_t *pc, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out) { const char *flavor_name; @@ -3258,7 +3268,8 @@ dirvote_add_signatures_to_pending_consensus( log_info(LD_DIR, "Have %d signatures for adding to %s consensus.", sig_list ? smartlist_len(sig_list) : 0, flavor_name); } - r = networkstatus_add_detached_signatures(pc->consensus, sigs, msg_out); + r = networkstatus_add_detached_signatures(pc->consensus, sigs, + source, severity, msg_out); log_info(LD_DIR,"Added %d signatures to consensus.", r); if (r >= 1) { @@ -3307,6 +3318,7 @@ dirvote_add_signatures_to_pending_consensus( static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, + const char *source, const char **msg_out) { int r=0, i, n_added = 0, errors = 0; @@ -3323,10 +3335,12 @@ dirvote_add_signatures_to_all_pending_consensuses( for (i = 0; i < N_CONSENSUS_FLAVORS; ++i) { int res; + int severity = i == FLAV_NS ? LOG_NOTICE : LOG_INFO; pending_consensus_t *pc = &pending_consensuses[i]; if (!pc->consensus) continue; - res = dirvote_add_signatures_to_pending_consensus(pc, sigs, msg_out); + res = dirvote_add_signatures_to_pending_consensus(pc, sigs, source, + severity, msg_out); if (res < 0) errors++; else @@ -3373,7 +3387,7 @@ dirvote_add_signatures(const char *detached_signatures_body, log_notice(LD_DIR, "Got a signature from %s. " "Adding it to the pending consensus.", source); return dirvote_add_signatures_to_all_pending_consensuses( - detached_signatures_body, msg); + detached_signatures_body, source, msg); } else { log_notice(LD_DIR, "Got a signature from %s. " "Queuing it for the next consensus.", source); diff --git a/src/or/dirvote.h b/src/or/dirvote.h index de11fcf..b8acd6a 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -31,6 +31,8 @@ char *networkstatus_compute_consensus(smartlist_t *votes, consensus_flavor_t flavor); int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out); char *networkstatus_get_detached_signatures(smartlist_t *consensuses); void ns_detached_signatures_free(ns_detached_signatures_t *s); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 8fd9428..873d761 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1207,9 +1207,11 @@ test_dir_v3_networkstatus(void) /* Try adding it to con2. */ detached_text2 = get_detached_sigs(con2,con_md2); - test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, &msg)); + test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, "test", + LOG_INFO, &msg)); tor_free(detached_text2); - test_eq(1, networkstatus_add_detached_signatures(con_md2, dsig1, &msg)); + test_eq(1, networkstatus_add_detached_signatures(con_md2, dsig1, "test", + LOG_INFO, &msg)); tor_free(detached_text2); detached_text2 = get_detached_sigs(con2,con_md2); //printf("\n<%s>\n", detached_text2); @@ -1230,10 +1232,12 @@ test_dir_v3_networkstatus(void) "microdesc"))); /* Try adding to con2 twice; verify that nothing changes. */ - test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &msg)); + test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, "test", + LOG_INFO, &msg)); /* Add to con. */ - test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &msg)); + test_eq(2, networkstatus_add_detached_signatures(con, dsig2, "test", + LOG_INFO, &msg)); /* Check signatures */ voter = smartlist_get(con->voters, 1); sig = smartlist_get(voter->sigs, 0);

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit 94f358e0fa8a81bc2662091e0be6229817f1f53c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 14:15:14 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 87f1709..c6bcce1 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-08 11:41+0000\n" +"PO-Revision-Date: 2012-01-08 14:11+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3474,6 +3474,9 @@ msgid "" "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." msgstr "" +"TOR تشخیص داده است که ارائه دهندهٔ DNS شما پاسخهای نادرستی به دامین‌هایی‌ " +"شناخته شده میدهد. از آنجا که کامپیوتر کاربر برای دریافت پاسخ DNS به رله‌های " +"شبکهٔ TOR اتکا می‌کند، رله شما به عنوان رله خروجی استفاده نخواهد شد. " msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability"

1 0

[tor/maint-0.2.2] add a note from wanoskarnet
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 1416dd47a994fb9f3ff5108be8517270352c9699 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 09:03:03 2012 -0500 add a note from wanoskarnet he disagrees about what the code that we decided not to use would do --- src/common/tortls.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index ef61f71..37074de 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -781,6 +781,11 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, * with clients that are configured to use SSLv23_method(), so we should * probably never use it. */ + /* XXX wanoskarnet says this comment is bunk -- that even if we turn + * this line on, clients configured to use SSLv23 would still able to + * talk to us. But he also says it's ok to leave it out. I suggest we + * delete this whole clause (the one that's #if 0'ed out). I'll leave + * it in place until Nick expresses an opinion. -RD */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; #endif

1 0