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

[tor/maint-0.2.3] Merge branch 'smartlist_shorten' into maint-0.2.3
by nickm＠torproject.org 18 Jul '12

18 Jul '12

commit b355ddb20f534d772dcb42737ceb1d0264e2c3f1 Merge: 4cac5df 78dec94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 10:14:14 2012 -0400 Merge branch 'smartlist_shorten' into maint-0.2.3 changes/smartlist_foreach | 8 +++++ src/common/container.h | 24 ++++++++++------ src/common/log.c | 5 +-- src/or/circuitbuild.c | 14 ++++----- src/or/config.c | 8 ++-- src/or/connection.c | 15 ++++------ src/or/connection_edge.c | 5 +-- src/or/control.c | 24 ++++++--------- src/or/cpuworker.c | 5 +-- src/or/directory.c | 24 ++++++--------- src/or/dirserv.c | 28 ++++++++---------- src/or/dirvote.c | 69 ++++++++++++++++++++------------------------ src/or/geoip.c | 4 +- src/or/main.c | 5 +-- src/or/networkstatus.c | 32 ++++++++++----------- src/or/policies.c | 14 ++++----- src/or/rendservice.c | 8 ++-- src/or/routerlist.c | 53 +++++++++++++++------------------- src/or/routerparse.c | 4 +- src/test/test.c | 5 +-- src/test/test_util.c | 5 +-- 21 files changed, 166 insertions(+), 193 deletions(-)

1 0

[tor/maint-0.2.3] Tweaks to 6400 changes file and docs as suggested by arma
by nickm＠torproject.org 18 Jul '12

18 Jul '12

commit 78dec943074c26747abc7a68cd6aec5269100569 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 10:12:19 2012 -0400 Tweaks to 6400 changes file and docs as suggested by arma --- changes/smartlist_foreach | 10 ++++++---- src/common/container.h | 24 +++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/changes/smartlist_foreach b/changes/smartlist_foreach index 0a6c960..2fd3a1a 100644 --- a/changes/smartlist_foreach +++ b/changes/smartlist_foreach @@ -1,6 +1,8 @@ o Code simplification and refactoring: - - Do not allow the body of any SMARTLIST_FOREACH block to exceed - 10 lines. Doing so in the past has led to hard-to-debug code. + - Do not use SMARTLIST_FOREACH for any loop whose body exceeds + 10 lines. Doing so in the past has led to hard-to-debug code. The new style is to use the SMARTLIST_FOREACH_{BEGIN,END} pair. - - Do not allow SMARTLIST_FOREACH blocks to nest. Any nested block - ought to be using SMARTLIST_FOREACH_{BEGIN,END}. + Issue 6400. + - Do not nest SMARTLIST_FOREACH blocks within one another. Any + nested block ought to be using SMARTLIST_FOREACH_{BEGIN,END}. + Issue 6400. diff --git a/src/common/container.h b/src/common/container.h index c11c2eb..dab3b83 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -142,9 +142,9 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, /** Iterate over the items in a smartlist sl, in order. For each item, * assign it to a new local variable of type type named var, and - * execute the statement cmd. Inside the loop, the loop index can - * be accessed as var_sl_idx and the length of the list can be accessed - * as var_sl_len. + * execute the statements inside the loop body. Inside the loop, the loop + * index can be accessed as var_sl_idx and the length of the list can + * be accessed as var_sl_len. * * NOTE: Do not change the length of the list while the loop is in progress, * unless you adjust the _sl_len variable correspondingly. See second example @@ -153,23 +153,21 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * Example use: * <pre> * smartlist_t *list = smartlist_split("A:B:C", ":", 0, 0); - * SMARTLIST_FOREACH(list, char *, cp, - * { + * SMARTLIST_FOREACH_BEGIN(list, char *, cp) { * printf("%d: %s\n", cp_sl_idx, cp); * tor_free(cp); - * }); + * } SMARTLIST_FOREACH_END(cp); * smartlist_free(list); * </pre> * * Example use (advanced): * <pre> - * SMARTLIST_FOREACH(list, char *, cp, - * { + * SMARTLIST_FOREACH_BEGIN(list, char *, cp) { * if (!strcmp(cp, "junk")) { * tor_free(cp); * SMARTLIST_DEL_CURRENT(list, cp); * } - * }); + * } SMARTLIST_FOREACH_END(cp); * </pre> */ /* Note: these macros use token pasting, and reach into smartlist internals. @@ -218,6 +216,14 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, var = NULL; \ } STMT_END +/** + * An alias for SMARTLIST_FOREACH_BEGIN and SMARTLIST_FOREACH_END, using + * cmd as the loop body. This wrapper is here for convenience with + * very short loops. + * + * By convention, we do not use this for loops which nest, or for loops over + * 10 lines or so. Use SMARTLIST_FOREACH_{BEGIN,END} for those. + */ #define SMARTLIST_FOREACH(sl, type, var, cmd) \ SMARTLIST_FOREACH_BEGIN(sl,type,var) { \ cmd; \

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Jul '12

18 Jul '12

commit 8b61e3c0d9caf7285a5f30287ec81b4996fff648 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 13:15:02 2012 +0000 Update translations for bridgedb --- tr/bridgedb.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tr/bridgedb.po b/tr/bridgedb.po index 93717b4..fb88dd1 100644 --- a/tr/bridgedb.po +++ b/tr/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-07-18 12:33+0000\n" +"PO-Revision-Date: 2012-07-18 13:04+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -37,13 +37,13 @@ msgid "" "To use the above lines, go to Vidalia's Network settings page, and click\n" "\"My ISP blocks connections to the Tor network\". Then add each bridge\n" "address one at a time." -msgstr "" +msgstr "Yukarıdaki satırları kullanmak için Vidalia Ağ Ayarları sayfasını açın ve \"ISS Tor ağına bağlantılarımı engelliyor\" maddesine tıklayın. Sonrasında her seferinde bir tane olmak üzere köprülerinizi ekleyebilirsiniz." #: lib/bridgedb/I18n.py:32 msgid "" "Configuring more than one bridge address will make your Tor connection\n" "more stable, in case some of the bridges become unreachable." -msgstr "" +msgstr "Birden fazla köprü adresi ayarlamak, bazı köprüler ulaşılamaz durumda olduğunda Tor bağlantınızı daha stabil hale getirir" #: lib/bridgedb/I18n.py:35 msgid ""

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Jul '12

18 Jul '12

commit 6ad18a08794b77d38023dfd853ca387006c545f2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 12:45:08 2012 +0000 Update translations for orbot --- values-tr/strings.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/values-tr/strings.xml b/values-tr/strings.xml index c21fce0..aac14cd 100644 --- a/values-tr/strings.xml +++ b/values-tr/strings.xml @@ -38,6 +38,17 @@ <string name="pref_transparent_port_fallback_summary">UYARI: Genel portlardan (80,443, v.b.) kaçınınız. SADECE \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string> <string name="pref_transparent_port_title">Port Listesi</string> <string name="pref_transparent_port_summary">Vekil sunucu port listesi. SADECE \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string> + <string name="pref_transparent_port_dialog">Vekil sunucu portlarını giriniz</string> + <string name="pref_has_root">Yönetici Erişimi Talebi</string> + <string name="pref_has_root_summary">Transparan Vekil Sunuculuk için Yönetici Erişimi Talebi</string> + <string name="status_install_success">Tor binarileri başarıyla yüklendi!</string> + <string name="status_install_fail">Tor binari dosyaları yüklenemedi. Lütfen günlüğü kontrol ediniz ve tor-assistants(a)torproject.org adresini kullanarak bilgilendirme yapınız.</string> + <string name="title_error">Uygulama Hatası</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">Orbot Hakkında</string> + <string name="btn_next">İleri</string> + <string name="btn_back">Geri</string> + <string name="btn_finish">Bitir</string>    @@ -50,6 +61,12 @@ <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="button_grant_superuser">Süper Kullanıcı Erişimi Talebi</string> + <string name="pref_select_apps">Uygulamaları Seç</string> + <string name="pref_select_apps_summary">Tor Üzerinden Yönlendirilecek Uygulamaları Seç</string> + <string name="pref_node_configuration">Nokta Konfigürasyonu</string> + <string name="pref_node_configuration_summary">Bu ayarlar bağlantınızın anonimliğini azaltabilecek gelişmiş ayarlardır.</string> + <string name="pref_entrance_node">Giriş Noktaları</string>  <string name="default_bridges"/>

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Jul '12

18 Jul '12

commit ffccefa6a6a184f491cdd16eed0b5da1e82e09ab Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 12:45:02 2012 +0000 Update translations for bridgedb --- tr/bridgedb.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tr/bridgedb.po b/tr/bridgedb.po index 2c2ee97..93717b4 100644 --- a/tr/bridgedb.po +++ b/tr/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <ergungorler(a)gmail.com>, 2012. # Sercan Altundaş <>, 2012. # Tekel Bira <psycookie(a)gmail.com>, 2012. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-16 15:51+0000\n" -"Last-Translator: Sercan Altundaş <>\n" +"PO-Revision-Date: 2012-07-18 12:33+0000\n" +"Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: lib/bridgedb/I18n.py:21 msgid "Here are your bridge relays: " -msgstr "" +msgstr "Köprü anahtarlamalarınız şu şekildedir:" #: lib/bridgedb/I18n.py:23 msgid "" @@ -29,7 +30,7 @@ msgid "" "in the main directory. Since there is no complete public list of them,\n" "even if your ISP is filtering connections to all the known Tor relays,\n" "they probably won't be able to block all the bridges." -msgstr "" +msgstr "Köprü anahtarlamaları (yada kısaca \"köprüler\") ana dizinde listenmemiş olan Tor anahtarlamalarıdır. Bağlı bulunduğunuz ISS bilinen tüm Tor anahtarlamalarına filtre uyguluyor olsa bile umumi olarak yayınlanmış tam bir liste mevcut olmadığından büyük bir ihtimalle bütün köprüleri bloklayamayacaktır." #: lib/bridgedb/I18n.py:28 msgid ""

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Jul '12

18 Jul '12

commit d49c93f13c0dface1da1b32406593c01e0467875 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 12:15:06 2012 +0000 Update translations for orbot --- values-tr/strings.xml | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/values-tr/strings.xml b/values-tr/strings.xml index 1d15758..c21fce0 100644 --- a/values-tr/strings.xml +++ b/values-tr/strings.xml @@ -31,8 +31,13 @@ <string name="press_to_start">- başlatmak için uzun basın -</string> <string name="pref_trans_proxy_group">Transparan Vekil Sunuculuğu (Yeniden Başlatma Gerektirir)</string> <string name="pref_trans_proxy_title">Transparan Vekil Sunuculuğu</string> - <string name="pref_trans_proxy_summary">Otomatik Uygulama Tor \'laştırma</string> - <string name="pref_transparent_all_title">Tor Herşey</string> + <string name="pref_trans_proxy_summary">Uygulamalar için Otomatik Tor Uyarlaması</string> + <string name="pref_transparent_all_title">Herşeyi Tor ile Uyarla</string> + <string name="pref_transparent_all_summary">Tor\'a uyarlanmış uygulamaların vekil sunucu bağlantıları</string> + <string name="pref_transparent_port_fallback_title">Vekil Sunucu Yanıtsız Kalma Bildirim Portu</string> + <string name="pref_transparent_port_fallback_summary">UYARI: Genel portlardan (80,443, v.b.) kaçınınız. SADECE \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string> + <string name="pref_transparent_port_title">Port Listesi</string> + <string name="pref_transparent_port_summary">Vekil sunucu port listesi. SADECE \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Jul '12

18 Jul '12

commit 576a908b2b8bbcd3269c2385ceb78ea4a8ed0c2c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 11:45:05 2012 +0000 Update translations for orbot --- values-tr/strings.xml | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/values-tr/strings.xml b/values-tr/strings.xml index f9d9b72..1d15758 100644 --- a/values-tr/strings.xml +++ b/values-tr/strings.xml @@ -1,9 +1,38 @@ <?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">Tor\'u başlat ve durdur</string> + <string name="tor_proxy_service_process">torproxyservice</string> <string name="status_starting_up">Orbot başlatılıyor...</string> <string name="status_activated">Tor ağına bağlandı</string> <string name="status_disabled">Orbot devre dışı bırakıldı</string> + <string name="status_shutting_down">Orbot kapatılıyor</string> + <string name="not_anonymous_yet">UYARI: Bağlantınız henüz anonim değildir! Lütfen uygulamalarınızı HTTP 127.0.0.1:8118 veya SOCKS4A / SOCKS5 127.0.0.1:9050 vekil sunucusu kullanacak şekilde yapılandırınız.</string> + <string name="menu_home">Başlangıç</string> + <string name="menu_browse">Göz At</string> + <string name="menu_settings">Ayarlar</string> + <string name="menu_log">Günlük</string> + <string name="menu_info">Yardım</string> + <string name="menu_apps">Uygulamalar</string> + <string name="menu_start">Başlat</string> + <string name="menu_stop">Durdur</string> + <string name="menu_about">Hakkında</string> + <string name="menu_wizard">Sihirbaz</string> + <string name="button_help">Yardım</string> + <string name="button_close">Kapat</string> + <string name="button_about">Hakkında</string> + <string name="button_clear_log">Günlüğü Temizle</string> + <string name="menu_verify">Kontrol Et</string> + <string name="menu_exit">Çıkış</string> + <string name="press_to_start">- başlatmak için uzun basın -</string> + <string name="pref_trans_proxy_group">Transparan Vekil Sunuculuğu (Yeniden Başlatma Gerektirir)</string> + <string name="pref_trans_proxy_title">Transparan Vekil Sunuculuğu</string> + <string name="pref_trans_proxy_summary">Otomatik Uygulama Tor \'laştırma</string> + <string name="pref_transparent_all_title">Tor Herşey</string>    @@ -19,4 +48,5 @@  <string name="default_bridges"/> + <string name="powered_by">The Tor Project tarafından desteklenmektedir.</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Jul '12

18 Jul '12

commit 66b8244bcec56adc37044eecd7805af8e551d823 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 11:15:05 2012 +0000 Update translations for orbot --- values-tr/strings.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/values-tr/strings.xml b/values-tr/strings.xml new file mode 100644 index 0000000..f9d9b72 --- /dev/null +++ b/values-tr/strings.xml @@ -0,0 +1,22 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <string name="control_permission_label">Tor\'u başlat ve durdur</string> + <string name="status_starting_up">Orbot başlatılıyor...</string> + <string name="status_activated">Tor ağına bağlandı</string> + <string name="status_disabled">Orbot devre dışı bırakıldı</string> +  +  +  +  +  +  +  +  +  +  + <string name="default_bridges"/> +</resources>

1 0

[doctor/master] Fix message rate limiting for messages older than 24 hours.
by karsten＠torproject.org 18 Jul '12

18 Jul '12

commit 248f3292cf960dbc7436dd4f3956d741b36ebaad Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 18 12:15:59 2012 +0200 Fix message rate limiting for messages older than 24 hours. When rate limiting was first implemented, the longest time period between two warnings was 24 hours. We later added more warnings about expiring certs in two or three months, which shouldn't be emitted every 24 hours. --- src/org/torproject/doctor/StatusFileReport.java | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index b103b4a..a0aef09 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -34,9 +34,9 @@ public class StatusFileReport { this.writeLastWarned(); } - /* Map of warning message strings of the last 24 hours and when they - * were last included in the 'new-warnings' file. This map is used to - * implement rate limiting. */ + /* Map of warning message strings and when they were last included in + * the 'new-warnings' file. This map is used to implement rate + * limiting. */ private Map<String, Long> lastWarned = new HashMap<String, Long>(); /* Read when we last emitted a warning to rate-limit some of them. */ @@ -57,10 +57,6 @@ public class StatusFileReport { } long warnedMillis = Long.parseLong(line.substring(0, line.indexOf(": "))); - if (warnedMillis < now - 24L * 60L * 60L * 1000L) { - /* Remove warnings that are older than 24 hours. */ - continue; - } String message = line.substring(line.indexOf(": ") + 2); lastWarned.put(message, warnedMillis); }

1 0

[metrics-tasks/master] Plot entropy, max entropy, and degree of anonymity (#6232).
by karsten＠torproject.org 18 Jul '12

18 Jul '12

commit 2d3fa7220f355cfb389f55100f65306b9055ba82 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 18 10:40:54 2012 +0200 Plot entropy, max entropy, and degree of anonymity (#6232). --- task-6232/plot-entropy.R | 51 +++++++++++++++++++++++++++++++++++++--------- task-6232/pyentropy.py | 23 ++++++++++++++++---- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index 87035b9..ab57678 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -1,19 +1,50 @@ library(ggplot2) library(reshape) +library(scales) + d <- read.csv("entropy.csv", header = FALSE, - col.names = c("validafter", "all", "exit", "guard", "country")) -d <- aggregate( - list(all = d$all, exit = d$exit, guard = d$guard, country = d$country), + col.names = c("validafter", "all", "max_all", "exit", "max_exit", + "guard", "max_guard", "country", "max_country")) + +e <- aggregate( + list(all = d$all / d$max_all, exit = d$exit / d$max_exit, + guard = d$guard / d$max_guard, country = d$country / d$max_country), by = list(date = as.Date(d$validafter, origin = "1970-01-01 00:00:00")), FUN = median) -d <- melt(d, "date") -ggplot(d, aes(x = date, y = value, colour = variable)) + +e <- melt(e, "date") +e <- data.frame(date = e$date, variable = ifelse(e$variable == "all", + "All relays", ifelse(e$variable == "exit", "All exits", + ifelse(e$variable == "guard", "All guards", "All countries"))), + value = e$value) +ggplot(e, aes(x = date, y = value)) + geom_line() + +facet_wrap(~ variable) + scale_x_date(name = "\nDate") + -scale_y_continuous(name = "Degree of Anonymity\n") + -scale_colour_hue(name = "Relays", - breaks = c("all", "exit", "guard", "country"), - labels = c("All relays", "All exits", "All guards", "All countries")) -ggsave("entropy.png", width = 8, height = 6, dpi = 100) +scale_y_continuous(name = "Degree of anonymity\n", limits = c(0, 1), + labels = percent) +ggsave("degree-of-anonymity.png", width = 8, height = 6, dpi = 100) +f <- aggregate(list(all = d$all, max_all = d$max_all, exit = d$exit, + max_exit = d$max_exit, guard = d$guard, max_guard = d$max_guard, + country = d$country, max_country = d$max_country), + by = list(date = as.Date(d$validafter, origin = "1970-01-01 00:00:00")), + FUN = median) +f <- rbind( + data.frame(date = f$date, entropy = f$all, max = f$max_all, + type = "All relays"), + data.frame(date = f$date, entropy = f$exit, max = f$max_exit, + type = "All exits"), + data.frame(date = f$date, entropy = f$guard, max = f$max_guard, + type = "All guards"), + data.frame(date = f$date, entropy = f$country, max = f$max_country, + type = "All countries")) +f <- melt(f, c("date", "type")) +ggplot(f, aes(x = date, y = value, colour = variable)) + +geom_line() + +facet_wrap(~ type) + +scale_x_date(name = "\nDate") + +scale_y_continuous(name = "Entropy and maximum entropy\n", + limits = c(0, max(f$value))) + +opts(legend.position = "none") +ggsave("entropy.png", width = 8, height = 6, dpi = 100) diff --git a/task-6232/pyentropy.py b/task-6232/pyentropy.py index abb716a..ae28f05 100644 --- a/task-6232/pyentropy.py +++ b/task-6232/pyentropy.py @@ -1,6 +1,15 @@ """ Usage - python pyentropy.py <consensus-dir> <output-file> -Output - A CSV file of the format <valid-after>,<entropy for all nodes>,<entropy for exitnodes>,<entropy for guardnodes>,<entropy for countries> +Output - A CSV file of the format (without newlines): + <valid-after>, + <entropy for all nodes>, + <max entropy for all nodes>, + <entropy for exit nodes>, + <max entropy for exit nodes>, + <entropy for guard nodes>, + <max entropy for guard nodes>, + <entropy for countries>, + <max entropy for countries> rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/consensuses in """ @@ -101,10 +110,14 @@ def run(file_name): max_entropy_country = math.log(len(bw_countries), 2) return ",".join([valid_after, - str(entropy/max_entropy), - str(entropy_exit/max_entropy_exit), - str(entropy_guard/max_entropy_guard), - str(entropy_country/max_entropy_country)]) + str(entropy), + str(max_entropy), + str(entropy_exit), + str(max_entropy_exit), + str(entropy_guard), + str(max_entropy_guard), + str(entropy_country), + str(max_entropy_country)]) def usage(): print "Usage - python pyentropy.py <consensus-dir> <output-file>"

1 0