- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 23 Oct '11

23 Oct '11

commit 47c5b6ed0345930948cb89fa357418a7f754f922 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 22 18:34:54 2011 +0000 Update translations for vidalia_help --- es/server.po | 61 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 11 deletions(-) diff --git a/es/server.po b/es/server.po index e6b9f63..bbdc305 100644 --- a/es/server.po +++ b/es/server.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-10-20 04:19+0000\n" +"PO-Revision-Date: 2011-10-22 18:32+0000\n" "Last-Translator: lenazun <lenazun(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/server.html:16 msgid "Setting Up a Tor Relay" -msgstr "Configurando un retransmisor de Tor" +msgstr "Configurando una retransmisión de Tor" #. type: Content of: <html><body> #: en/server.html:19 @@ -79,7 +79,7 @@ msgstr "" "directo a la red Tor. Marque la casilla Retransmitir tráfico para la red " "Tor si quiere poner en funcionamiento una retransmisión Tor normal o " "Ayuda a los usuarios censurados a conectar con la red Tor si desea " -"poner en funcionamiento un retransmisor puente." +"poner en funcionamiento una retransmisión puente." #. type: Content of: <html><body><ol><li> #: en/server.html:44 @@ -153,10 +153,10 @@ msgid "" "contribute to the Tor network. You can run a relay, while still keeping your" " network connection usable for your own use." msgstr "" -"Poner en funcionamiento un retransmisor de Tor consume mucho ancho de banda." -" En cualquier caso, Tor le permite limitar la cantidad de ancho de banda que" -" desea compartir con la red Tor. De este modo, puede ejecutar un " -"retransmisor sin comprometer su conexión." +"Poner en funcionamiento una retransmisión de Tor consume mucho ancho de " +"banda. En cualquier caso, Tor le permite limitar la cantidad de ancho de " +"banda que desea compartir con la red Tor. De este modo, puede ejecutar una " +"retransmisión sin comprometer su conexión." #. type: Content of: <html><body> #: en/server.html:80 @@ -186,6 +186,15 @@ msgid "" "exceed the specified rate. Your maximum rate must always be greater " "than or equal to your average rate." msgstr "" +"La tasa promedio es un conjunto de bytes utilizados para atender las " +"solicitudes durante cortos períodos de tráfico más alto de lo especificado " +"en su tasa promedio, pero aún manteniendo el promedio a lo largo de " +"un período extendido. Una tasa promedio baja y una tasa máxima alta " +"determinan el cálculo de un promedio a largo plazo, mientras que permite " +"más tráfico durante los períodos más altos, si el promedio no se ha " +"alcanzado últimamente. Si su tasa promedio es la misma que su tasa " +"máxima, entonces Tor nunca excederá la tasa especificada. Su tasa " +"máxima siempre debe ser mayor o igual a su tasa promedio." #. type: Content of: <html><body> #: en/server.html:96 @@ -196,6 +205,11 @@ msgid "" "connection). Tor requires a minimum of 20 kilobytes per second to run a " "relay." msgstr "" +"La tasa promedio es el máximo de ancho de banda permitido a largo " +"plazo (en kilobytes por segundo). Por ejemplo, usted puede elegir 2 " +"megabytes por segundo (2048 KB/s) o 50 kilobytes por segundo (una conexión " +"por cable de velocidad mediana). Tor requiere un mínimo de 20 kilobytes por" +" segundo para ejecutar una retransmisión. " #. type: Content of: <html><body> #: en/server.html:103 @@ -207,6 +221,13 @@ msgid "" "too much strain on your bandwidth, you should consider unchecking the " "checkbox labeled Mirror the relay directory." msgstr "" +"Es importante recordar que Tor mide el ancho de banda en bytes y no " +"en bits. Además, Tor solamente cuenta los bytes recibidos en vez de los " +"bytes enviados. Por ejemplo, si su retransmisión está replicando un " +"directorio, usted podría enviar más bytes de los que recibe. Si encuentra " +"que este es el caso y que esto requiere mucho esfuerzo en términos de ancho " +"de banda, podría considerar des-seleccionar la casilla marcada Replicar " +"el directorio de retransmisiones." #. type: Content of: <html><body> #: en/server.html:111 @@ -216,7 +237,7 @@ msgstr "<a name=\"exitpolicy\"/>" #. type: Content of: <html><body><h3> #: en/server.html:112 msgid "Exit Policies" -msgstr "" +msgstr "Políticas de salida" #. type: Content of: <html><body> #: en/server.html:114 @@ -227,6 +248,12 @@ msgid "" "as mail to prevent spam and some default file sharing ports to reduce abuse " "of the Tor network." msgstr "" +"Las políticas de salida le dan una forma de especificar qué tipo de recursos" +" de Internet permitirá a otros usuarios de Tor acceder desde su " +"retransmisión Tor. Tor usa una lista de políticas de salida que restringen " +"varios servicios, tales como el correo electrónico para prevenir el spam, y " +"otros puertos predeterminados para compartir archivos, para reducir el abuso" +" de la red Tor. " #. type: Content of: <html><body> #: en/server.html:121 @@ -238,6 +265,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 "" +"Cada una de las casillas representa un tipo de recurso que los usuarios de " +"Tor tendrán permiso para acceder desde su retransmisión. Si usted desactiva " +"la casilla junto a un recurso en particular, los usuarios de Tor no podrán " +"acceder ese recurso desde su retransmisión. Si la casilla Otros " +"servicios Misc está activada, los usuarios de Tor podrán acceder a otros" +" servicios no cubiertos por las otras casillas o la política de salida " +"predeterminada por Tor. " #. type: Content of: <html><body> #: en/server.html:130 @@ -247,6 +281,11 @@ msgid "" "column describes the resources Tor clients will be allowed to access through" " your relay, if the associated box is checked." msgstr "" +"La siguiente tabla lista de forma completa los números de puerto específicos" +" representados por cada una de las casillas de la política de salida. La " +"columna Descripción describe los recursos que los clientes de Tor " +"tendrán permiso de acceder a través de su retransmisión, si la casilla " +"correspondiente está marcada." #. type: Content of: <html><body><table><tr><td> #: en/server.html:138 @@ -374,8 +413,8 @@ msgid "" "grayed out, since bridge relays do not allow exit connections. Bridges are " "only used by Tor clients to connect to the Tor network." msgstr "" -"Si elige ejecutar un retransmisor puente, las Políticas de Salida " -"aparecerán desactivadas, ya que los retransmisores puente no permiten las " +"Si elige ejecutar una retransmisión puente, las Políticas de Salida " +"aparecerán desactivadas, ya que las retransmisiones puente no permiten las " "conexiones de salida. Los puentes sólo son usados por los clientes de Tor " "para conectarse a la red Tor." @@ -387,7 +426,7 @@ msgstr "<a name=\"upnp\"/>" #. type: Content of: <html><body><h3> #: en/server.html:189 msgid "Port Forwarding" -msgstr "" +msgstr "Redirección de Puertos" #. type: Content of: <html><body> #: en/server.html:191

1 0

r25180: {website} update mirror status. (in website/trunk: . include)
by Andrew Lewman 23 Oct '11

23 Oct '11

Author: phobos Date: 2011-10-22 17:58:04 +0000 (Sat, 22 Oct 2011) New Revision: 25180 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-10-21 17:41:02 UTC (rev 25179) +++ website/trunk/include/mirrors-table.wmi 2011-10-22 17:58:04 UTC (rev 25180) @@ -20,6 +20,23 @@ <td>NL</td> + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + <td></td> <td>Up to date</td> @@ -69,6 +86,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>torproject.is</td> @@ -103,6 +137,23 @@ <tr> + <td>DE</td> + + <td>torservers</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IR</td> <td>Ninjas</td> @@ -137,6 +188,23 @@ <tr> + <td>AT</td> + + <td>FoDT.IT</td> + + <td>Up to date</td> + + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>BarkerJr</td> @@ -307,15 +375,15 @@ <tr> - <td>FR</td> + <td>US</td> - <td>LazyTiger</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -324,15 +392,15 @@ <tr> - <td>IS</td> + <td>FR</td> - <td>TheOnionRouter</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -341,127 +409,59 @@ <tr> - <td>DE</td> + <td>SE</td> - <td>[[:bbs:]]</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.homosu.net/dist">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>EE</td> - - <td>CyberSIDE</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>DE</td> - <td>Amorphis</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>AT</td> + <td>INT</td> - <td>FoDT.IT</td> + <td>CoralCDN</td> <td>Up to date</td> - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>SE</td> - - <td>homosu</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.homosu.net/dist">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> - <td>torservers</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - <td></td> <td>Up to date</td> @@ -562,19 +562,19 @@ <tr> - <td>INT</td> + <td>IS</td> - <td>CoralCDN</td> + <td>TheOnionRouter</td> <td>Unknown</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://www.theonionrouter.com/dist/">http</a></td> + <td><a href="http://www.theonionrouter.com/">http</a></td> + <td><a href="https://www.theonionrouter.com/dist/">https</a></td> + <td><a href="https://www.theonionrouter.com/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-10-21 17:41:02 UTC (rev 25179) +++ website/trunk/update-mirrors.pl 2011-10-22 17:58:04 UTC (rev 25180) @@ -240,10 +240,12 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "Unknown", - httpWebsiteMirror => "http://theonionrouter.com/", + httpWebsiteMirror => "http://www.theonionrouter.com/", + httpsWebsiteMirror => "https://www.theonionrouter.com/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://theonionrouter.com/dist/", + httpDistMirror => "http://www.theonionrouter.com/dist/", + httpsDistMirror => "https://www.theonionrouter.com/dist/", rsyncDistMirror => "", updateDate => "Unknown", },

1 0

[translation-tools/master] Implement a simple status file, updated on success
by sebastian＠torproject.org 22 Oct '11

22 Oct '11

commit 0da9255a08a4b59b0674ca55be402e7453726a15 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Oct 21 17:38:35 2011 +0200 Implement a simple status file, updated on success Suggestion by weasel. This is so we can monitor when the cronjob is stuck via nagios. --- config | 2 ++ update_translations | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/config b/config index 855119f..fc54c97 100644 --- a/config +++ b/config @@ -10,3 +10,5 @@ TX=/srv/translation.torproject.org/transifex-client/bin/tx PROJECTS="bridgedb gettor orbot tsum vidalia vidalia_help vidalia_installer" PIDFILE=/srv/translation.torproject.org/run/update_translations.pid + +STATUSFILE=/srv/translation.torproject.org/run/last_success diff --git a/update_translations b/update_translations index 520aef3..97f2ee8 100755 --- a/update_translations +++ b/update_translations @@ -44,3 +44,5 @@ if [ -f ${PIDFILE} ]; then rm ${PIDFILE} fi +# Touch the status file, to indicate that we successfully updated translations. +touch $STATUSFILE

1 0

r25179: {website} remove the VISTA text from the tor users page, as that app w (website/trunk/about/en)
by Andrew Lewman 22 Oct '11

22 Oct '11

Author: phobos Date: 2011-10-21 17:41:02 +0000 (Fri, 21 Oct 2011) New Revision: 25179 Modified: website/trunk/about/en/torusers.wml Log: remove the VISTA text from the tor users page, as that app was pending, and never granted. Modified: website/trunk/about/en/torusers.wml =================================================================== --- website/trunk/about/en/torusers.wml 2011-10-21 03:55:40 UTC (rev 25178) +++ website/trunk/about/en/torusers.wml 2011-10-21 17:41:02 UTC (rev 25179) @@ -227,17 +227,15 @@ write were to get back to your boss, would you lose your job? If your social worker read about your opinion of the system, would she treat you differently? Anonymity gives a voice to the voiceless. - To support this, Tor currently has an open Americorps/VISTA position pending. This - government grant will cover a full time stipend for a volunteer to create - curricula to show low-income populations how to use anonymity online for - safer civic engagement. Although it's often said that the poor do not use - online access for civic engagement, failing to act in their self-interests, - it is our hypothesis (based on personal conversations and anecdotal - information) that it is precisely the “permanent record ” - left online that keeps many of the poor from speaking out on the Internet. - We hope to show people how to engage more safely online, and then at - the end of the year, evaluate how online and offline civic engagement has - changed, and how the population sees this continuing into the future. + Although it's often said that the poor do not use online access + for civic engagement, failing to act in their self-interests, it + is our hypothesis (based on personal conversations and anecdotal + information) that it is precisely the “permanent record + ” left online that keeps many of the poor from speaking out + on the Internet. We hope to show people how to engage more safely + online, and then at the end of the year, evaluate how online and + offline civic engagement has changed, and how the population sees + this continuing into the future. </li> </ul>

1 0

[tor/master] remove code related to tracking descriptor serving times
by nickm＠torproject.org 21 Oct '11

21 Oct '11

commit af02c4a9c3ee0ab85a4ecf5c7ff16e2da901c886 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Oct 7 02:42:52 2011 +0200 remove code related to tracking descriptor serving times This had broken due to bitrot - it doesn't know about microdescriptors at all, and afaik hasn't generally been used in ages. --- changes/remove_TRACK_SERVED_TIME | 4 ++++ src/or/dirserv.c | 6 ------ src/or/or.h | 5 ----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/changes/remove_TRACK_SERVED_TIME b/changes/remove_TRACK_SERVED_TIME new file mode 100644 index 0000000..cd5d380 --- /dev/null +++ b/changes/remove_TRACK_SERVED_TIME @@ -0,0 +1,4 @@ + o Removed features: + - Remove the ability to define TRACK_SERVED_TIME. The feature wasn't used + and is now outdated that microdescriptors are around. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 96a5913..f64dcff 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3482,9 +3482,6 @@ connection_dirserv_finish_spooling(dir_connection_t *conn) static int connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) { -#ifdef TRACK_SERVED_TIME - time_t now = time(NULL); -#endif int by_fp = (conn->dir_spool_src == DIR_SPOOL_SERVER_BY_FP || conn->dir_spool_src == DIR_SPOOL_EXTRA_BY_FP); int extra = (conn->dir_spool_src == DIR_SPOOL_EXTRA_BY_FP || @@ -3512,9 +3509,6 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) * unknown bridge descriptor has shown up between then and now. */ continue; } -#ifdef TRACK_SERVED_TIME - sd->last_served_at = now; -#endif body = signed_descriptor_get_body(sd); if (conn->zlib_state) { /* XXXX022 This 'last' business should actually happen on the last diff --git a/src/or/or.h b/src/or/or.h index 6969a9c..7a901e7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1690,11 +1690,6 @@ typedef struct signed_descriptor_t { * networkstatus that listed it. 0 for "never listed in a consensus or * status, so far as we know." */ time_t last_listed_as_valid_until; -#ifdef TRACK_SERVED_TIME - /** The last time we served anybody this descriptor. Used for internal - * testing to see whether we're holding on to descriptors too long. */ - time_t last_served_at; /*XXXX remove if not useful. */ -#endif /* If true, we do not ever try to save this object in the cache. */ unsigned int do_not_cache : 1; /* If true, this item is meant to represent an extrainfo. */

1 0

[tor/master] Add new stats type: descriptor fetch stats
by nickm＠torproject.org 21 Oct '11

21 Oct '11

commit 03c06b629fc604030393567ec05c16f813d43529 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Oct 7 02:39:48 2011 +0200 Add new stats type: descriptor fetch stats This is used for the bridge authority currently, to get a better intuition on how many descriptors are actually fetched from it and how many fetches happen in total. Implements ticket 4200. --- changes/ticket4200 | 5 ++ src/or/config.c | 10 ++++- src/or/dirserv.c | 1 + src/or/main.c | 5 ++ src/or/rephist.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 5 ++ 6 files changed, 141 insertions(+), 1 deletions(-) diff --git a/changes/ticket4200 b/changes/ticket4200 new file mode 100644 index 0000000..9df9930 --- /dev/null +++ b/changes/ticket4200 @@ -0,0 +1,5 @@ + o Minor features: + - The bridge authority now writes statistics on how many bridge + descriptors it gave out in total, and how unique descriptors + it gave out. Implements ticket 4200. + diff --git a/src/or/config.c b/src/or/config.c index 59bbe1d..627e1ac 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1532,7 +1532,8 @@ options_act(const or_options_t *old_options) if (options->CellStatistics || options->DirReqStatistics || options->EntryStatistics || options->ExitPortStatistics || - options->ConnDirectionStatistics) { + options->ConnDirectionStatistics || + options->BridgeAuthoritativeDir) { time_t now = time(NULL); int print_notice = 0; if ((!old_options || !old_options->CellStatistics) && @@ -1577,6 +1578,10 @@ options_act(const or_options_t *old_options) options->ConnDirectionStatistics) { rep_hist_conn_stats_init(now); } + if (!old_options || !old_options->BridgeAuthoritativeDir) { + rep_hist_desc_stats_init(now); + print_notice = 1; + } if (print_notice) log_notice(LD_CONFIG, "Configured to measure statistics. Look for " "the *-stats files that will first be written to the " @@ -1598,6 +1603,9 @@ options_act(const or_options_t *old_options) if (old_options && old_options->ConnDirectionStatistics && !options->ConnDirectionStatistics) rep_hist_conn_stats_term(); + if (old_options && old_options->BridgeAuthoritativeDir && + !options->BridgeAuthoritativeDir) + rep_hist_desc_stats_term(); /* Check if we need to parse and add the EntryNodes config option. */ if (options->EntryNodes && diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f64dcff..4b9587b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3509,6 +3509,7 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) * unknown bridge descriptor has shown up between then and now. */ continue; } + rep_hist_note_desc_served(sd->identity_digest); body = signed_descriptor_get_body(sd); if (conn->zlib_state) { /* XXXX022 This 'last' business should actually happen on the last diff --git a/src/or/main.c b/src/or/main.c index aa167e1..d01552f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1268,6 +1268,11 @@ run_scheduled_events(time_t now) if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } + if (options->BridgeAuthoritativeDir) { + time_t next_write = rep_hist_desc_stats_write(time_to_write_stats_files); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } time_to_write_stats_files = next_time_to_write_stats_files; } diff --git a/src/or/rephist.c b/src/or/rephist.c index de4a1ef..8038bf4 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2596,6 +2596,120 @@ rep_hist_buffer_stats_write(time_t now) return start_of_buffer_stats_interval + WRITE_STATS_INTERVAL; } +/*** Descriptor serving statistics ***/ + +/** Digestmap to track which descriptors were downloaded this stats + * collection interval. It maps descriptor digest to pointers to 1, + * effectively turning this into a list. */ +static digestmap_t *served_descs = NULL; + +/** Number of how many descriptors were downloaded in total during this + * interval. */ +static unsigned long total_descriptor_downloads; + +/** Start time of served descs stats or 0 if we're not collecting those. */ +static time_t start_of_served_descs_stats_interval; + +/** Initialize descriptor stats. */ +void +rep_hist_desc_stats_init(time_t now) +{ + if (served_descs) { + log_warn(LD_BUG, "Called rep_hist_desc_stats_init() when desc stats were " + "already initialized. This is probably harmless."); + return; // Already initialized + } + served_descs = digestmap_new(); + total_descriptor_downloads = 0; + start_of_served_descs_stats_interval = now; +} + +/** Reset served descs stats to empty, starting a new interval now. */ +static void +rep_hist_reset_desc_stats(time_t now) +{ + rep_hist_desc_stats_term(); + rep_hist_desc_stats_init(now); +} + +/** Stop collecting served descs stats, so that rep_hist_desc_stats_init() is + * safe to be called again. */ +void +rep_hist_desc_stats_term(void) +{ + digestmap_free(served_descs, NULL); + served_descs = NULL; + start_of_served_descs_stats_interval = 0; + total_descriptor_downloads = 0; +} + +/** Helper for rep_hist_desc_stats_write(). Return a newly allocated string + * containing the served desc statistics until now, or NULL if we're not + * collecting served desc stats. Caller must ensure that now is not before + * start_of_served_descs_stats_interval. */ +static char * +rep_hist_format_desc_stats(time_t now) +{ + char t[ISO_TIME_LEN+1]; + char *result; + + if (!start_of_served_descs_stats_interval) + return NULL; + + format_iso_time(t, now); + + tor_asprintf(&result, + "served-descs-stats-end %s (%d s) total=%lu unique=%u\n", + t, + (unsigned) (now - start_of_served_descs_stats_interval), + total_descriptor_downloads, + digestmap_size(served_descs)); + + return result; +} + +/** If WRITE_STATS_INTERVAL seconds have passed since the beginning of + * the current served desc stats interval, write the stats to + * $DATADIR/stats/served-desc-stats (possibly appending to an existing file) + * and reset the state for the next interval. Return when we would next want + * to write served desc stats or 0 if we won't want to write. */ +time_t +rep_hist_desc_stats_write(time_t now) +{ + char *statsdir = NULL, *filename = NULL, *str = NULL; + + if (!start_of_served_descs_stats_interval) + return 0; /* We're not collecting stats. */ + if (start_of_served_descs_stats_interval + WRITE_STATS_INTERVAL > now) + return start_of_served_descs_stats_interval + WRITE_STATS_INTERVAL; + + str = rep_hist_format_desc_stats(now); + + statsdir = get_datadir_fname("stats"); + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { + log_warn(LD_HIST, "Unable to create stats/ directory!"); + goto done; + } + filename = get_datadir_fname2("stats", "served-desc-stats"); + if (append_bytes_to_file(filename, str, strlen(str), 0) < 0) + log_warn(LD_HIST, "Unable to write served descs statistics to disk!"); + + rep_hist_reset_desc_stats(now); + + done: + tor_free(statsdir); + tor_free(filename); + tor_free(str); + return start_of_served_descs_stats_interval + WRITE_STATS_INTERVAL; +} + +void +rep_hist_note_desc_served(const char * desc) +{ + digestmap_set(served_descs, desc, (void *)1); + total_descriptor_downloads++; +} + /*** Connection statistics ***/ /** Start of the current connection stats interval or 0 if we're not @@ -2839,5 +2953,7 @@ rep_hist_free_all(void) smartlist_free(circuits_for_buffer_stats); circuits_for_buffer_stats = NULL; } + rep_hist_desc_stats_term(); + total_descriptor_downloads = 0; } diff --git a/src/or/rephist.h b/src/or/rephist.h index e590659..0a3e46a 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -82,6 +82,11 @@ void rep_hist_add_buffer_stats(double mean_num_cells_in_queue, char *rep_hist_format_buffer_stats(time_t now); void rep_hist_reset_buffer_stats(time_t now); +void rep_hist_desc_stats_init(time_t now); +void rep_hist_note_desc_served(const char * desc); +void rep_hist_desc_stats_term(void); +time_t rep_hist_desc_stats_write(time_t now); + void rep_hist_conn_stats_init(time_t now); void rep_hist_note_or_conn_bytes(uint64_t conn_id, size_t num_read, size_t num_written, time_t when);

1 0

[tor/master] Check for jumping clock in *format_*stats functions
by nickm＠torproject.org 21 Oct '11

21 Oct '11

commit 42b96a041de39399a60a622329c5d5ecf593ab99 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Oct 21 17:01:38 2011 +0200 Check for jumping clock in *format_*stats functions None of these were real bugs (yet), because the callers made sure everything was fine. Make it more explicit. Suggested by Nick --- src/or/geoip.c | 10 ++++++++-- src/or/rephist.c | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 67dea96..73194ae 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -976,7 +976,8 @@ geoip_dirreq_stats_term(void) } /** Return a newly allocated string containing the dirreq statistics - * until now, or NULL if we're not collecting dirreq stats. */ + * until now, or NULL if we're not collecting dirreq stats. Caller + * must ensure start_of_dirreq_stats_interval is in the past. */ char * geoip_format_dirreq_stats(time_t now) { @@ -992,6 +993,8 @@ geoip_format_dirreq_stats(time_t now) if (!start_of_dirreq_stats_interval) return NULL; /* Not initialized. */ + tor_assert(now >= start_of_dirreq_stats_interval); + format_iso_time(t, now); v2_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); v3_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); @@ -1351,7 +1354,8 @@ geoip_entry_stats_term(void) } /** Return a newly allocated string containing the entry statistics - * until now, or NULL if we're not collecting entry stats. */ + * until now, or NULL if we're not collecting entry stats. Caller + * must ensure start_of_entry_stats_interval lies in the past. */ char * geoip_format_entry_stats(time_t now) { @@ -1362,6 +1366,8 @@ geoip_format_entry_stats(time_t now) if (!start_of_entry_stats_interval) return NULL; /* Not initialized. */ + tor_assert(now >= start_of_entry_stats_interval); + data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); format_iso_time(t, now); tor_asprintf(&result, "entry-stats-end %s (%u s)\nentry-ips %s\n", diff --git a/src/or/rephist.c b/src/or/rephist.c index 8038bf4..1aa0aeb 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2114,7 +2114,8 @@ _compare_int(const void *x, const void *y) } /** Return a newly allocated string containing the exit port statistics - * until now, or NULL if we're not collecting exit stats. */ + * until now, or NULL if we're not collecting exit stats. Caller + * must ensure start_of_exit_stats_interval is in the past. */ char * rep_hist_format_exit_stats(time_t now) { @@ -2133,6 +2134,8 @@ rep_hist_format_exit_stats(time_t now) if (!start_of_exit_stats_interval) return NULL; /* Not initialized. */ + tor_assert(now >= start_of_exit_stats_interval); + /* Go through all ports to find the n ports that saw most written and * read bytes. * @@ -2456,7 +2459,8 @@ rep_hist_reset_buffer_stats(time_t now) } /** Return a newly allocated string containing the buffer statistics until - * now, or NULL if we're not collecting buffer stats. */ + * now, or NULL if we're not collecting buffer stats. Caller must + * ensure start_of_buffer_stats_interval is in the past. */ char * rep_hist_format_buffer_stats(time_t now) { @@ -2475,6 +2479,8 @@ rep_hist_format_buffer_stats(time_t now) if (!start_of_buffer_stats_interval) return NULL; /* Not initialized. */ + tor_assert(now >= start_of_buffer_stats_interval); + /* Calculate deciles if we saw at least one circuit. */ memset(processed_cells, 0, SHARES * sizeof(int)); memset(circs_in_share, 0, SHARES * sizeof(int)); @@ -2874,7 +2880,8 @@ rep_hist_note_or_conn_bytes(uint64_t conn_id, size_t num_read, } /** Return a newly allocated string containing the connection statistics - * until now, or NULL if we're not collecting conn stats. */ + * until now, or NULL if we're not collecting conn stats. Caller must + * ensure start_of_conn_stats_interval is in the past. */ char * rep_hist_format_conn_stats(time_t now) { @@ -2883,6 +2890,8 @@ rep_hist_format_conn_stats(time_t now) if (!start_of_conn_stats_interval) return NULL; /* Not initialized. */ + tor_assert(now >= start_of_conn_stats_interval); + format_iso_time(written, now); tor_asprintf(&result, "conn-bi-direct %s (%d s) %d,%d,%d,%d\n", written,

1 0

[tor/master] Fix missing word in changes/ticket4200
by nickm＠torproject.org 21 Oct '11

21 Oct '11

commit 4fbc6152eda885fbbc155b0950d2dffa0a32549c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 21 11:25:16 2011 -0400 Fix missing word in changes/ticket4200 --- changes/ticket4200 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/ticket4200 b/changes/ticket4200 index 9df9930..71bc04f 100644 --- a/changes/ticket4200 +++ b/changes/ticket4200 @@ -1,5 +1,5 @@ o Minor features: - The bridge authority now writes statistics on how many bridge - descriptors it gave out in total, and how unique descriptors + descriptors it gave out in total, and how many unique descriptors it gave out. Implements ticket 4200.

1 0

[tor/master] Merge branch 'ticket4200'
by nickm＠torproject.org 21 Oct '11

21 Oct '11

commit cc3f0ba1e8b49f0dc2a40c80d741808380e0ab45 Merge: 29825f0 4fbc615 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 21 11:25:29 2011 -0400 Merge branch 'ticket4200' changes/remove_TRACK_SERVED_TIME | 4 + changes/ticket4200 | 5 ++ src/or/config.c | 10 +++- src/or/dirserv.c | 7 +-- src/or/geoip.c | 10 ++- src/or/main.c | 5 ++ src/or/or.h | 5 -- src/or/rephist.c | 131 +++++++++++++++++++++++++++++++++++++- src/or/rephist.h | 5 ++ 9 files changed, 165 insertions(+), 17 deletions(-)

1 0

r25178: {website} link to polipo windows binary for those who want it (website/trunk/docs/en)
by Roger Dingledine 21 Oct '11

21 Oct '11

Author: arma Date: 2011-10-21 03:55:40 +0000 (Fri, 21 Oct 2011) New Revision: 25178 Modified: website/trunk/docs/en/faq.wml Log: link to polipo windows binary for those who want it Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-10-20 14:18:49 UTC (rev 25177) +++ website/trunk/docs/en/faq.wml 2011-10-21 03:55:40 UTC (rev 25178) @@ -822,7 +822,10 @@ -If that fails, feel free to install privoxy or polipo. You can use <a +If that fails, feel free to install <a +href="http://www.privoxy.org/">privoxy</a> or <a +href="https://archive.torproject.org/tor-package-archive/polipo/">polipo</a>. +You can use <a href="https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:/build-scripts…">our old polipo config file</a> if you like. However, please realize that this approach is unsupported.

1 0