- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit 5edb75d3c401b6aaccd759e7a783b58080beaec2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 14:15:30 2011 +0000 Update translations for vidalia_help --- de/services.po | 15 ++++++++++++++- nl/server.po | 9 ++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/de/services.po b/de/services.po index e85602a..a49bc7e 100644 --- a/de/services.po +++ b/de/services.po @@ -8,7 +8,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 17:00+0200\n" -"PO-Revision-Date: 2011-11-14 09:10+0000\n" +"PO-Revision-Date: 2011-11-21 14:13+0000\n" "Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -144,6 +144,14 @@ msgid "" "display the real onion address, you need to save your configuration and re-" "open the settings window." msgstr "" +"Onion Adresse (generiert): Die Dienste oder (oder Onion) Adresse wird von " +"TOR generiert damit ihr Dienst eindeutig identifiziert werden kann. Geben " +"Sie dieses Adresse denjenigen die Ihren Dienst nutzen können sollen. Am " +"Besten tun Sie dies per Copy & Paste um Rechtschreib-Fehler zu vermeiden. " +"Wenn Sie gerade erst eine versteckten Dienst erstellt haben dann ist dort " +"\"[Erstellt von Tor]\" eingetragen. Um dies zu ändern damit die richtige " +"Onion -Adresse angezeigt wird speichern Sie bitte Ihre Änderungen ab und " +"öffnen das Einstellungen-Fenster." #. type: Content of: <html><body><ul><li> #: en/services.html:68 @@ -154,6 +162,11 @@ msgid "" "port usually has nothing to do with firewall settings, because it is only " "used Tor-internally." msgstr "" +"Virtueller Port (benötigt): Dies ist der TCP-Port den die Clients benötigen " +"um auf ihren Dienst zuzugreifen. Normalerweise sollten Sie hier den " +"typischen Port des jeweiligen Dienstes verwenden wie z.B. Port 80 für HTTP. " +"Dieser Port hat normalerweise nichts mit der Firewall zu tun weil er " +"ausschließlich TOR intern verwendet wird." #. type: Content of: <html><body><ul><li> #: en/services.html:73 diff --git a/nl/server.po b/nl/server.po index 66369f3..63a8bf1 100644 --- a/nl/server.po +++ b/nl/server.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 17:00+0200\n" -"PO-Revision-Date: 2011-11-21 13:13+0000\n" +"PO-Revision-Date: 2011-11-21 14:00+0000\n" "Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -437,6 +437,13 @@ msgid "" "want to run a Tor relay, however, other Tor clients and relays must be able " "to connect to your relay through your home router or firewall." msgstr "" +"Veel thuisgebruikers verbinden met het internet via een router, die " +"meerdere computers in een lokaal netwerk in staat stelt om dezelfde " +"internetverbinding te delen. Sommige gebruikers kunnen ook achter een " +"firewall zitten die inkomende verbindingen naar uw computer vanaf " +"andere computers op het internet blokkeert. Als je echter een Tor relay wilt" +" draaien, moeten andere Tor clients en relay's in staat zijn om verbinding " +"te maken met je relay via je router of firewall." #. type: Content of: <html><body> #: en/server.html:200

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit 2670c964f5f65093f0aa8b4e1b51cbc73be68036 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 14:15:03 2011 +0000 Update translations for orbot --- values-de/strings.xml | 76 ++++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index 77d0211..680b807 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -141,45 +141,45 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="privoxy_is_running_on_port_">Privoxy läuft auf Port:</string> <string name="setting_up_port_based_transparent_proxying_">Richte Port-basiertes transparentes Proxiying ein...</string> <string name="bridge_error">Bridge Fehler</string> - <string name="bridge_requires_ip"></string> - <string name="send_email_for_bridges"></string> + <string name="bridge_requires_ip">Um das Bridge-Feature nutzen zu können müssen Sie mindestens eine IP-Adresse eingeben.</string> + <string name="send_email_for_bridges">Senden Sie von Ihrem gmail Account ein e-Mail an bridges(a)torproject.org mit dem Text \"get bridges\" im Nachrichten-Feld.</string> <string name="error">Fehler</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="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellte erreichbare e-Mail Adresse hat einen Ausnahme-Fehler erzeugt.</string> + <string name="your_relay_settings_caused_an_exception_">Ihre Relay Einstellungen haben einen Ausnahme-Fehler erzeugt.</string> + <string name="exit_nodes">Exit Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerabdrücke, Spitz-Namen, Länder und Adressen für den letzten Knoten-Punkt.</string> + <string name="enter_exit_nodes">Tragen Sie die Exit-Nodes ein.</string> + <string name="exclude_nodes">Nodes Ausnahmen</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitz-Namen, Länder und Adressen die ausgenommen werden sollen.</string> + <string name="enter_exclude_nodes">Geben Sie die auszunehmenden Nodes ein.</string> + <string name="strict_nodes">Strikte Nodes</string> + <string name="use_only_these_specified_nodes">Benutze *ausschließlich* diese angegebenen Nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Benutze Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Benutze alternative Eingangs-Nodes in das TOR-Netzwerk</string> + <string name="ip_address_and_port_of_bridges">IP Adresse und Port der Bridges</string> + <string name="enter_bridge_addresses">Geben Sie die Bridge_Adressen ein</string> + <string name="relays">Relays</string> + <string name="relaying">Relaying</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Aktivieren das Ihr Gerät ein non-exit Relay ist.</string> + <string name="relay_port">Relay Port</string> + <string name="listening_port_for_your_tor_relay">Port auf den bei Ihrem TOR-Relay gehört werden soll</string> + <string name="enter_or_port">OR-Port eingeben</string> + <string name="relay_nickname">Relay Spitzname</string> + <string name="the_nickname_for_your_tor_relay">Der Spitzname für Ihren TOR-Relay</string> + <string name="enter_a_custom_relay_nickname">Geben Sie einen selbsterstellten Relay Spitznamen an</string> <string name="reachable_addresses">Erreichbare Adressen</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Als Client hinter einer Firewall mit restriktiven Regeln betreiben</string> <string name="reachable_ports">Erreichbare 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="ports_reachable_behind_a_restrictive_firewall">Die Ports sind hinter einer restriktiven Firewall erreichbar</string> + <string name="enter_ports">Ports eingeben</string> + <string name="enable_hidden_services">Versteckte Dienste aktivieren</string> + <string name="run_servers_accessible_via_the_tor_network">Betrieben von Servern auf die vom TOR-Netzwerk aus zugegriffen werden kann.</string> + <string name="enter_localhost_ports_for_hidden_services">TRagen Sie die lokelen Ports für die versteckten Dienste ein</string> + <string name="hidden_service_ports">Versteckte Dienste Ports</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihre versteckten Dienste (werden automatisch generiert)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktiviere Debug Log Ausgabe (benötigt adb oder alogcat zur Ansicht)</string> - <string name="project_home"></string> + <string name="project_home">Heimat des Projekt(s):</string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> <string name="the_tor_license">Die Tor Lizenz</string> <string name="https_torproject_org">https://torproject.org</string> @@ -188,10 +188,10 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <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="hidden_service_request"></string> + <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string> <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string> <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string> - <string name="hidden_service_on"></string> - <string name="unable_to_read_hidden_service_name"></string> + <string name="hidden_service_on">Verstckte Dienste auf:</string> + <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string> <string name="unable_to_start_tor">Kann Tor nicht starten:</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit 97c74b894b465d07abc4cc2b1015c18b247bca1c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 13:45:04 2011 +0000 Update translations for orbot --- values-de/strings.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index 505785a..77d0211 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -131,8 +131,8 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_proxy_port_summary">Proxy Server Port</string> <string name="pref_proxy_port_dialog">Proxy Port eingeben</string> <string name="status">Status</string> - <string name="setting_up_full_transparent_proxying_"></string> - <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="setting_up_full_transparent_proxying_">Einstellen des voll transparenten Proxys...</string> + <string name="setting_up_app_based_transparent_proxying_">Einstellen des Anwendungs-basierten transparenten Proxys...</string> <string name="transparent_proxying_enabled">Transparentes Proxying aktiviert</string> <string name="transproxy_enabled_for_tethering_">TransProxy für Tethering aktiviert!</string> <string name="warning_error_starting_transparent_proxying_">WARNUNG: Fehler beim Starten von transparentem Proxying!</string> @@ -140,7 +140,7 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="couldn_t_start_tor_process_">Konnte Tor Prozess nicht starten:</string> <string name="privoxy_is_running_on_port_">Privoxy läuft auf Port:</string> <string name="setting_up_port_based_transparent_proxying_">Richte Port-basiertes transparentes Proxiying ein...</string> - <string name="bridge_error"></string> + <string name="bridge_error">Bridge Fehler</string> <string name="bridge_requires_ip"></string> <string name="send_email_for_bridges"></string> <string name="error">Fehler</string>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit beda480d1bd84a113092078b71609fd877c811a0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 13:15:29 2011 +0000 Update translations for vidalia_help --- nl/server.po | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/nl/server.po b/nl/server.po index 9a4f82b..66369f3 100644 --- a/nl/server.po +++ b/nl/server.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 17:00+0200\n" -"PO-Revision-Date: 2011-11-20 17:30+0000\n" +"PO-Revision-Date: 2011-11-21 13:13+0000\n" "Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -262,6 +262,13 @@ msgid "" "checked, Tor users will be able to access other services not covered by the " "other checkboxes or Tor's default exit policy." msgstr "" +"Elk van de selectievakjes stelt een type service voor dat je Tor-gebruikers " +"kunt toestaan te benaderen via je relay. Als je het vakje naast een service" +" uitvinkt, zullen Tor-gebruikers niet worden toegestaan om deze service " +"via je relay te benaderen. Als het vakje Verschillende andere " +"services is aangevinkt, kunnen Tor-gebruikers andere diensten benaderen " +"die niet onder de andere selectievakjes of Tor's standaard exit-policy " +"vallen." #. type: Content of: <html><body> #: en/server.html:130 @@ -440,6 +447,12 @@ msgid "" "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." msgstr "" +"Om je relay openbaar toegankelijk te maken, moet je router of firewall weten" +" welke poorten naar je computer door te laten door het opzetten van wat " +"bekend is als poort forwarding. Poort forwarding configureert je " +"router of firewall om alle verbindingen naar bepaalde poorten op je router " +"of firewall te \"forwarden\" (of door te sturen) naar lokale poorten op je " +"computer." #. type: Content of: <html><body> #: en/server.html:208 @@ -451,6 +464,13 @@ msgid "" "can use the Test button next to the checkbox to find out if Vidalia " "is able to automatically set up port forwarding for you." msgstr "" +"Als je het vakje Probeer automatisch poort forwarding te configureren" +" aanvinkt, zal Vidalia proberen om automatisch port forwarding in te stellen" +" op je lokale netwerk verbinding, zodat andere Tor clients verbinding kunnen" +" maken met je relay. Echter, niet alle routers ondersteunen automatische " +"poort forwarding. Je kunt de knop Test naast de checkbox gebruiken om" +" te achterhalen of Vidalia in staat is om automatisch port forwarding voor " +"je in te stellen." #. type: Content of: <html><body> #: en/server.html:217

1 0

[torflow/master] Add some notifications for #4359/#2286.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 4aef555236bfa22bec0edf571e3de44011a2188d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 21:38:45 2011 -0800 Add some notifications for #4359/#2286. --- NetworkScanners/BwAuthority/aggregate.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index fc16f67..86dcf71 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -664,6 +664,16 @@ def main(argv): plog("NOTICE", "Did not measure "+str(MIN_REPORT)+"% of nodes yet ("+str(measured_pct)+"%)") sys.exit(1) + # Notification hack because #2286/#4359 is annoying arma + if measured_bw_pct < 75: + plog("WARN", + "Only measured %f of the previous consensus bandwidth despite measuring %f of the nodes" % + (measured_bw_pct, measured_pct)) + elif measured_bw_pct < 95: + plog("NOTICE", + "Only measured %f of the previous consensus bandwidth despite measuring %f of the nodes" % + (measured_bw_pct, measured_pct)) + plog("INFO", "Measured "+str(measured_pct) +"% of all tor nodes (" +str(measured_bw_pct)+"% of previous consensus bw).")

1 0

[torflow/master] Use desc bw if consensus bw is missing for some log lines
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit b6bbfd1c7e040e43a67bd13eb7bc6a0b6a1e87a1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 21:40:32 2011 -0800 Use desc bw if consensus bw is missing for some log lines --- NetworkScanners/BwAuthority/aggregate.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 86dcf71..46dce2e 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -652,7 +652,9 @@ def main(argv): #if time.mktime(r.published.utctimetuple()) - r.uptime \ # < oldest_timestamp: missed_nodes += 1.0 - if n.bandwidth != None: + if n.bandwidth == None: + missed_bw += r.bw + else: missed_bw += n.bandwidth # We still tend to miss about 80 nodes even with these # checks.. Possibly going in and out of hibernation?

1 0

[torflow/master] Be consistent about Wgd application for Guard+Exit nodes.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 54f0fe26a6371d8f2f8fa8c47753afd5289b690f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 21:16:50 2011 -0800 Be consistent about Wgd application for Guard+Exit nodes. Also correct log line. --- NetworkScanners/BwAuthority/aggregate.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 46b8300..fc16f67 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -557,8 +557,8 @@ def main(argv): and "Exit" in prev_consensus[n.idhex].flags): n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex], cs_junk.K_p*(1.0-cs_junk.bw_weights["Wgd"]), - cs_junk.K_i, - cs_junk.K_d, + cs_junk.K_i*(1.0-cs_junk.bw_weights["Wgd"]), + cs_junk.K_d*(1.0-cs_junk.bw_weights["Wgd"]), cs_junk.K_i_decay) else: n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex], @@ -659,7 +659,7 @@ def main(argv): plog("DEBUG", "Didn't measure "+n.idhex+"="+n.nickname+" at "+str(round((100.0*n.list_rank)/max_rank,1))+" "+str(n.bandwidth)) measured_pct = round(100.0*len(nodes)/(len(nodes)+missed_nodes),1) - measured_bw_pct = round((100.0*missed_bw)/tot_bw,1) + measured_bw_pct = 100.0 - round((100.0*missed_bw)/tot_bw,1) if measured_pct < MIN_REPORT: plog("NOTICE", "Did not measure "+str(MIN_REPORT)+"% of nodes yet ("+str(measured_pct)+"%)") sys.exit(1)

1 0

[torflow/master] Display a total of previous consensus bw measured in INFO logs.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit c2479563d22bd55462d0c923a1f652aff0cb7133 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 20:52:49 2011 -0800 Display a total of previous consensus bw measured in INFO logs. --- NetworkScanners/BwAuthority/aggregate.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 8e308d1..46b8300 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -637,7 +637,11 @@ def main(argv): plog("INFO", "Oldest updated node: "+time.ctime(oldest_updated)) missed_nodes = 0.0 + missed_bw = 0 + tot_bw = 0 for n in prev_consensus.itervalues(): + if n.bandwidth != None: + tot_bw += n.bandwidth if not n.measured: if "Fast" in n.flags and "Running" in n.flags: try: @@ -648,16 +652,21 @@ def main(argv): #if time.mktime(r.published.utctimetuple()) - r.uptime \ # < oldest_timestamp: missed_nodes += 1.0 + if n.bandwidth != None: + missed_bw += n.bandwidth # We still tend to miss about 80 nodes even with these # checks.. Possibly going in and out of hibernation? plog("DEBUG", "Didn't measure "+n.idhex+"="+n.nickname+" at "+str(round((100.0*n.list_rank)/max_rank,1))+" "+str(n.bandwidth)) measured_pct = round(100.0*len(nodes)/(len(nodes)+missed_nodes),1) + measured_bw_pct = round((100.0*missed_bw)/tot_bw,1) if measured_pct < MIN_REPORT: plog("NOTICE", "Did not measure "+str(MIN_REPORT)+"% of nodes yet ("+str(measured_pct)+"%)") sys.exit(1) - plog("INFO", "Measured "+str(measured_pct)+"% of all tor nodes.") + plog("INFO", + "Measured "+str(measured_pct) +"% of all tor nodes (" + +str(measured_bw_pct)+"% of previous consensus bw).") n_print = nodes.values() n_print.sort(lambda x,y: int(y.pid_error*1000) - int(x.pid_error*1000))

1 0

[torflow/master] Output git revision.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 02a11b2728581c0f446fd3aeeca2a1b42beb30e0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 20:43:11 2011 -0800 Output git revision. --- NetworkScanners/BwAuthority/aggregate.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index c55b9a1..8e308d1 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -56,6 +56,9 @@ MAX_AGE = 2*GUARD_SAMPLE_RATE # If the resultant scan file is older than 1.5 days, something is wrong MAX_SCAN_AGE = 60*60*24*1.5 +# path to git repos (.git) +PATH_TO_TORFLOW_REPO = '../../.git/' +PATH_TO_TORCTL_REPO = '../../TorCtl/.git/' def base10_round(bw_val): # This keeps the first 3 decimal digits of the bw value only @@ -327,6 +330,11 @@ def main(argv): TorUtil.read_config(argv[1]+"/scanner.1/bwauthority.cfg") TorUtil.loglevel = "NOTICE" + (branch, head) = TorUtil.get_git_version(PATH_TO_TORFLOW_REPO) + plog('INFO', 'TorFlow Version: %s' % branch+' '+head) + (branch, head) = TorUtil.get_git_version(PATH_TO_TORCTL_REPO) + plog('INFO', 'TorCtl Version: %s' % branch+' '+head) + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect((TorUtil.control_host,TorUtil.control_port)) c = TorCtl.Connection(s)

1 0

[torflow/master] Bug #4330: Have snakeinspector attach files if they exist
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 63a3091397ffd4f4eae27f18c8103bb0ebfab7b1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Nov 19 15:47:34 2011 -0800 Bug #4330: Have snakeinspector attach files if they exist --- NetworkScanners/ExitAuthority/snakeinspector.py | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py index 608df54..c359719 100755 --- a/NetworkScanners/ExitAuthority/snakeinspector.py +++ b/NetworkScanners/ExitAuthority/snakeinspector.py @@ -274,7 +274,20 @@ def main(argv): text += traceback.format_exc() # TODO: Attach files? Or is that too much.. Maybe serve # them via http and include links? - send_mail(mail_from_email, mail_to_email, subject, text) + if isinstance(r, HttpTestResult) or \ + isinstance(r, JsTestResult) or \ + isinstance(r, HtmlTestResult): + attach = [] + if r.content: + attach.append(r.content) + if r.content_old: + attach.append(r.content_old) + if r.content_exit: + attach.append(r.content_exit) + send_mail(mail_from_email, mail_to_email, subject, text, + attach) + else: + send_mail(mail_from_email, mail_to_email, subject, text) if __name__ == "__main__": main(sys.argv)

1 0