- tor-commits - lists.torproject.org

[tordnsel/master] migrate from system var to self-contained /srv/tordnsel
by andrew＠torproject.org 08 Jan '12

08 Jan '12

commit 17b6b6babe5adaed998abc06e12e89182797dc56 Author: phobos <phobos@kilik> Date: Sun Jan 8 14:54:47 2012 -0500 migrate from system var to self-contained /srv/tordnsel --- src/TorDNSEL/Config/Tests.hs | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/TorDNSEL/Config/Tests.hs b/src/TorDNSEL/Config/Tests.hs index 382acb9..54460a0 100644 --- a/src/TorDNSEL/Config/Tests.hs +++ b/src/TorDNSEL/Config/Tests.hs @@ -28,26 +28,26 @@ tests = TestList . map TestCase $ config' = toConfig [ "User" ~> "nobody" - , "ConfigFile" ~> "/etc/tordnsel.conf" ] + , "ConfigFile" ~> "/srv/tordnsel/tordnsel.conf" ] -configArgs = ["--User", "nobody", "-f", "/etc/tordnsel.conf"] +configArgs = ["--User", "nobody", "-f", "/srv/tordnsel/tordnsel.conf"] config = toConfig [ "ZoneOfAuthority" ~> "exitlist.example.com." , "DomainName" ~> "exitlist-ns.example.com." , "SOARName" ~> "hostmaster.example.com." , "StateDirectory" ~> "/state" - , "RuntimeDirectory" ~> "/var/run/tordnsel" + , "RuntimeDirectory" ~> "/srv/tordnsel/run/" , "DNSListenAddress" ~> "127.0.0.1:53" , "Address" ~> "10.0.0.1" , "TorControlAddress" ~> "127.0.0.1:9051" , "TorControlPassword" ~> "password" - , "Log" ~> "notice file /var/log/tordnsel/log" + , "Log" ~> "notice file /srv/tordnsel/log/" , "RunAsDaemon" ~> "True" , "User" ~> "tordnsel" , "Group" ~> "tordnsel" - , "ChangeRootDirectory" ~> "/var/lib/tordnsel" - , "PIDFile" ~> "/var/run/tordnsel.pid" + , "ChangeRootDirectory" ~> "/srv/tordnsel/" + , "PIDFile" ~> "/srv/tordnsel/run/tordnsel.pid" , "EnableActiveTesting" ~> "True" , "TorSocksAddress" ~> "127.0.0.1:9050" , "TestListenAddress" ~> "10.0.0.1:80,443,110,53,22,5190,6667,9030" @@ -77,14 +77,14 @@ configFile = \\n\ \## Store exit test results in this directory. This should be an absolute\n\ \## path accessible inside the chroot (if one is configured).\n\ - \#StateDirectory /var/lib/tordnsel/state\n\ + \#StateDirectory /srv/tordnsel/state\n\ \## This line is equivalent to the previous line if you've specified\n\ - \## ChangeRootDirectory as /var/lib/tordnsel.\n\ + \## ChangeRootDirectory as /srv/tordnsel.\n\ \StateDirectory /state\n\ \\n\ \## Place the statistics and reconfigure sockets in this directory before\n\ \## chrooting or dropping privileges.\n\ - \RuntimeDirectory /var/run/tordnsel\n\ + \RuntimeDirectory /srv/tordnsel/run/\n\ \\n\ \################ Optional options #########################################\n\ \##\n\ @@ -121,7 +121,7 @@ configFile = \#Log notice stdout\n\ \#Log info stderr\n\ \#Log warn syslog\n\ - \Log notice file /var/log/tordnsel/log\n\ + \Log notice file /srv/tordnsel/log/\n\ \\n\ \## Detach from the controlling terminal and run in the background as a\n\ \## daemon. The default is \"False\".\n\ @@ -137,11 +137,11 @@ configFile = \\n\ \## Call chroot(2) to change our root directory. This option also requires\n\ \## root privileges.\n\ - \ChangeRootDirectory /var/lib/tordnsel\n\ + \ChangeRootDirectory /srv/tordnsel\n\ \\n\ \## Write our PID to the specified file before chrooting or dropping\n\ \## privileges. This file won't be removed on exit.\n\ - \PIDFile /var/run/tordnsel.pid\n\ + \PIDFile /srv/tordnsel/run/tordnsel.pid\n\ \\n\ \################ Active testing options ###################################\n\ \##\n\

1 0

[tordnsel/master] fix the paths for the sample file, as tordnsel should not be run as root nor as a system service.
by andrew＠torproject.org 08 Jan '12

08 Jan '12

commit 0b4719a79a12f0b1f4bcf08c73683cfe3246e405 Author: phobos <phobos@kilik> Date: Sun Jan 8 14:47:16 2012 -0500 fix the paths for the sample file, as tordnsel should not be run as root nor as a system service. --- config/tordnsel.conf.sample | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/tordnsel.conf.sample b/config/tordnsel.conf.sample index 7cf8895..a6b5b2a 100644 --- a/config/tordnsel.conf.sample +++ b/config/tordnsel.conf.sample @@ -21,14 +21,14 @@ ## Store exit test results in this directory. This should be an absolute ## path accessible inside the chroot (if one is configured). -#StateDirectory /var/lib/tordnsel/state +#StateDirectory /srv/tordnsel/state ## This line is equivalent to the previous line if you've specified ## ChangeRootDirectory as /var/lib/tordnsel. #StateDirectory /state ## Place the statistics and reconfigure sockets in this directory before ## chrooting or dropping privileges. -#RuntimeDirectory /var/run/tordnsel +#RuntimeDirectory /srv/tordnsel/tordnsel ################ Optional options ######################################### ## @@ -65,7 +65,7 @@ #Log notice stdout #Log info stderr #Log warn syslog -#Log notice file /var/log/tordnsel/log +#Log notice file /srv/tordnsel/log ## Detach from the controlling terminal and run in the background as a ## daemon. The default is "False". @@ -81,11 +81,11 @@ ## Call chroot(2) to change our root directory. This option also requires ## root privileges. -#ChangeRootDirectory /var/lib/tordnsel +#ChangeRootDirectory /srv/tordnsel/root ## Write our PID to the specified file before chrooting or dropping ## privileges. This file won't be removed on exit. -#PIDFile /var/run/tordnsel.pid +#PIDFile /srv/tordnsel/run/tordnsel.pid ################ Active testing options ################################### ##

1 0

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

08 Jan '12

commit e59bef87508ff9ff80d9617cab221647fc683426 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 19:45:17 2012 +0000 Update translations for vidalia --- fi/vidalia_fi.po | 73 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 29 deletions(-) diff --git a/fi/vidalia_fi.po b/fi/vidalia_fi.po index 7a1c4b9..83246b0 100644 --- a/fi/vidalia_fi.po +++ b/fi/vidalia_fi.po @@ -7,7 +7,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 19:13+0000\n" +"PO-Revision-Date: 2012-01-08 19:32+0000\n" "Last-Translator: morso <debris(a)riseup.net>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -140,7 +140,7 @@ msgstr "Valitse kansio, johon Tor-ohjelman tiedot tallennetaan" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Tor:in hallinta" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" @@ -152,7 +152,7 @@ msgstr "Polku:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "Käytä Unix domain socketia (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc" @@ -160,7 +160,7 @@ msgstr "Muokkaa nykyistä torrc:ta" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "HUOM: tämä muuttaa ladattuna olevaa torrc:ta" +msgstr "HUOM: tämä muuttaa nyt ladattuna olevaa torrc:ta" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -196,7 +196,7 @@ msgstr "Tor-asetustiedosto (torrc);;Kaikki tiedostot (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "Valitse tiedosto, jota käytetään Tor-socketin polkuna" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" @@ -1600,27 +1600,27 @@ msgstr "Tuntematon" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Debug" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Tietoa" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "Huomautus" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Varoitus" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Virhe" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Tuntematon" msgctxt "MainWindow" msgid "Start Tor" @@ -2098,6 +2098,9 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"Kaikkea tämän yhteyden yli lähetettyä voidaan tarkkailla. Tarkista " +"sovelluksesi asetukset ja käytä vain kryptattuja protokollia, kuten SSL:ää, " +"jos mahdollista." msgctxt "MainWindow" msgid "failed (%1)" @@ -2403,15 +2406,15 @@ msgstr "Tallenna automaattisesti uudet tapahtumat tiedostoon" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "Yksinkertainen" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Tor tila" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Edistynyt" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2698,31 +2701,31 @@ msgstr "Napsauta \"Ohje\"-painiketta nähdäksesi muita tapoja löytää siltoja msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Osoite:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Tyyppi" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Sinun on valittava välityspalvelimen tyyppi." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3159,7 +3162,7 @@ msgstr "<a href=\"#bridgeUsage\">Kuka on käyttänyt reititintäni?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Mikä tämä on?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" @@ -3266,19 +3269,19 @@ msgstr "Tor on luonut" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Kopioi leikepöydälle" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor-ohjelma on käynnissä" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Käytät parhaillaan Tor-ohjelman versiota \"%1\"" msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor-ohjelma ei ole käynnissä" msgctxt "StatusEventWidget" msgid "" @@ -3286,6 +3289,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"Napsauta \"Käynnistä Tor\" Vidalian hallintapaneelissa käynnistääksesi Tor-" +"ohjelman uudelleen. Jos Tor sulkeutui odottamattomasti, valitse ylhäältä " +"\"Edistynyt\"-välilehti saadaksesi tietoa mahdollisista virheistä." msgctxt "StatusEventWidget" msgid "" @@ -3294,6 +3300,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"Käytät parhaillaan Tor-ohjelman versiota \"%1\", jota ei enää suositella. " +"Päivitäthän ohjelman uusimpaan versioon, joka saattaa sisältää tärkeitä " +"turvallisuutta, luotettavuutta ja suorituskykyä parantavia korjauksia." msgctxt "StatusEventWidget" msgid "" @@ -3302,24 +3311,30 @@ msgid "" "version of the software, which may contain important security, reliability " "and performance fixes." msgstr "" +"Käytät parhaillaan Tor-ohjelman versiota \"%1\", joka ei ehkä enää toimi " +"nykyisen Tor-verkon kanssa. Päivitäthän ohjelman uusimpaan versioon, joka " +"saattaa sisältää tärkeitä turvallisuutta, luotettavuutta ja suorituskykyä " +"parantavia korjauksia." msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Tor-ohjelmasi on vanhentunut." msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Yhdistetty Tor-verkkoon." msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." msgstr "" +"Onnistuimme luomaan yhteyden Tor-verkkoon. Voit nyt asettaa ohjelmasi " +"käyttämään Internetiä anonyymisti." msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor Ohjelmavirhe" msgctxt "StatusEventWidget" msgid ""

1 0

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

08 Jan '12

commit f4a5462351dc7723f30eb589cfa5e1197f554b5a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 19:45:03 2012 +0000 Update translations for orbot --- values-el/strings.xml | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/values-el/strings.xml b/values-el/strings.xml index 0032d9d..df4cdf5 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -21,21 +21,21 @@ <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="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">με την δύναμη το Tor Project</string> + <string name="press_to_start">-για να εκκινήσει κρατήστε το πατημένο-</string> + <string name="pref_trans_proxy_group">Διαφανής Πληρεξούσιος Διακομηστής (Απαιτεί διαχείριση root)</string> + <string name="pref_trans_proxy_title">Διαφανής Πληρεξούσιος Διακομηστής</string> + <string name="pref_trans_proxy_summary">Αυτόματη Προσαρμογή Εφαρμογών στο Tor</string> <string name="pref_transparent_all_title"></string> <string name="pref_transparent_all_summary"></string> <string name="pref_transparent_port_fallback_title"></string>

1 0

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

08 Jan '12

commit d37d2bb88acb5cf005f678674982a29bfc8aac33 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 19:15:14 2012 +0000 Update translations for vidalia --- fi/vidalia_fi.po | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/fi/vidalia_fi.po b/fi/vidalia_fi.po index 4a6abbb..7a1c4b9 100644 --- a/fi/vidalia_fi.po +++ b/fi/vidalia_fi.po @@ -1,13 +1,14 @@ # # Translators: +# <debris(a)riseup.net>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" 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: 2011-09-08 00:47+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-08 19:13+0000\n" +"Last-Translator: morso <debris(a)riseup.net>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,11 +144,11 @@ msgstr "" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "Käytä TCP-yhteyttä (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Polku:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -155,39 +156,43 @@ msgstr "" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Muokkaa nykyistä torrc:ta" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "HUOM: tämä muuttaa ladattuna olevaa torrc:ta" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." -msgstr "" +msgstr "ControlSocket-polkua ei ole olemassa." msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." msgstr "" +"Annettu Tor-asetustiedoston sijainti sisältää merkkejä, joita järjestelmäsi " +"nykyinen 8-bittinen merkistökoodaus ei voi näyttää." msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." msgstr "" +"Annettu Tor-datahakemiston sijainti sisältää merkkejä, joita järjestelmäsi " +"nykyinen 8-bittinen merkistökoodaus ei voi näyttää." msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Varoitus" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "Muutit torrc:n polkua, haluaisitko käynnistää Tor:in uudelleen?" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Tor-asetustiedosto (torrc);;Kaikki tiedostot (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" @@ -1166,7 +1171,7 @@ msgstr "Zimbabwe" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "Zaire" msgctxt "CountryInfo" msgid "Albania" @@ -1266,29 +1271,31 @@ msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Lähetä kaatumisilmoitus" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia kohtasi ongelman ja oli suljettava" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Käynnistä Vidalia uudelleen" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Älä käynnistä uudelleen" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Vidaliaa ei voi käynnistää uudelleen" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Emme onnistuneet käynnistämään Vidaliaa uudelleen automaattisesti. Käynnistä" +" Vidalia uudelleen manuaalisesti." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:"

1 0

[tor/master] 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

[tor/master] 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

[tor/master] 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

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit ecdea4eeafd921f0dcb053f2585d9cb05d6df658 Merge: 59d0a5a cc1580d Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:17:16 2012 -0500 Merge branch 'maint-0.2.2' src/common/tortls.c | 5 +++++ src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/or/networkstatus.c | 25 ++++++++++++++++++------- src/test/test_dir.c | 12 ++++++++---- 5 files changed, 51 insertions(+), 15 deletions(-) diff --cc src/or/networkstatus.c index 7cd9d02,d5637b2..a835e78 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -484,8 -469,10 +484,10 @@@ networkstatus_check_consensus_signature int n_bad = 0; int n_unknown = 0; int n_no_signature = 0; - int n_v3_authorities = get_n_authorities(V3_AUTHORITY); + int n_v3_authorities = get_n_authorities(V3_DIRINFO); int n_required = n_v3_authorities/2 + 1; + smartlist_t *list_good = smartlist_create(); + smartlist_t *list_no_signature = smartlist_create(); smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); smartlist_t *missing_authorities = smartlist_create();

1 0

[tor/master] when the consensus fails, list which dir auths were in or out
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit cc1580dbe02f0f285fca65b7b388d99dbaf78f5c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:14:44 2012 -0500 when the consensus fails, list which dir auths were in or out --- src/or/networkstatus.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index b0ef74b..d5637b2 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -471,6 +471,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, int n_no_signature = 0; int n_v3_authorities = get_n_authorities(V3_AUTHORITY); int n_required = n_v3_authorities/2 + 1; + smartlist_t *list_good = smartlist_create(); + smartlist_t *list_no_signature = smartlist_create(); smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); smartlist_t *missing_authorities = smartlist_create(); @@ -521,11 +523,13 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, else if (sig->bad_signature) ++bad_here; } SMARTLIST_FOREACH_END(sig); - if (good_here) + + if (good_here) { ++n_good; - else if (bad_here) + smartlist_add(list_good, voter->nickname); + } else if (bad_here) { ++n_bad; - else if (missing_key_here) { + } else if (missing_key_here) { ++n_missing_key; if (dl_failed_key_here) ++n_dl_failed_key; @@ -533,6 +537,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, ++n_unknown; } else { ++n_no_signature; + smartlist_add(list_no_signature, voter->nickname); } } SMARTLIST_FOREACH_END(voter); @@ -580,13 +585,17 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, { smartlist_t *sl = smartlist_create(); char *cp; + char *tmp = smartlist_join_strings(list_good, " ", 0, NULL); tor_asprintf(&cp, "A consensus needs %d good signatures from recognized " - "authorities for us to accept it. This one has %d.", - n_required, n_good); + "authorities for us to accept it. This one has %d (%s).", + n_required, n_good, tmp); + tor_free(tmp); smartlist_add(sl,cp); if (n_no_signature) { - tor_asprintf(&cp, "%d of the authorities we know didn't sign it.", - n_no_signature); + tmp = smartlist_join_strings(list_no_signature, " ", 0, NULL); + tor_asprintf(&cp, "%d (%s) of the authorities we know didn't sign it.", + n_no_signature, tmp); + tor_free(tmp); smartlist_add(sl,cp); } if (n_unknown) { @@ -612,6 +621,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, } } + smartlist_free(list_good); + smartlist_free(list_no_signature); smartlist_free(unrecognized); smartlist_free(need_certs_from); smartlist_free(missing_authorities);

1 0