- tor-commits - lists.torproject.org

[torspec/master] Make the forward-compatibility sec of control-spec more bulletproof
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 4745fc3dbaf8253e96bf2a543d0140a60e6dba50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:27:46 2012 -0500 Make the forward-compatibility sec of control-spec more bulletproof --- control-spec.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 43212a5..cc82dca 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -81,6 +81,11 @@ a stream closed for an unrecognized reason is nevertheless closed, and should be reported as such. + (If some list of alternatives is given, and there isn't an explicit + statement that clients must tolerate unexpected values, clients still + must tolerate unexpected values. The only exception would be if there + were an explicit statement that no future values will ever be added.) + 2. Message format 2.1. Description format

1 0

[torspec/master] Note that UTCExpiry is omitted when Expiry is Never
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 901659e21373c87815d8808527b21e002fb662fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:24:09 2012 -0500 Note that UTCExpiry is omitted when Expiry is Never This corrects the format of addrmap events. Fix for 6829 --- control-spec.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 378fbbf..43212a5 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1543,7 +1543,7 @@ Syntax: "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry - [SP Error] SP UTCExpiry CRLF + [SP Error] [SP UTCExpiry] CRLF NewAddress = Address / "<error>" Expiry = DQUOTE ISOTime DQUOTE / "NEVER" @@ -1556,7 +1556,7 @@ Expiry is expressed as the local time (rather than UTC). This is a bug, left in for backward compatibility; new code should look at UTCExpiry - instead. + instead. (If Expiry is "NEVER", UTCExpiry is omitted.) These events are generated when a new address mapping is entered in the cache, or when the answer for a RESOLVE command is found.

1 0

[torspec/master] Try to document Reason and Status for ORCONN events
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 036e2564919b667b1f9efff1d0514d85e470d0c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:18:38 2012 -0500 Try to document Reason and Status for ORCONN events Should fix ticket 7513 --- control-spec.txt | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 5574110..378fbbf 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1479,6 +1479,35 @@ NumCircuits counts both established and pending circuits. + The ORStatus values are as follows: + NEW -- We have received a new incoming OR connection, and are starting + the server-side handshake. + LAUNCHED -- We have launched a new outgoing OR connection, and are + starting the client-side handshake. + CONNECTED -- The OR connection has been connected and the handshake is + done. + FAILED -- Our attempt to open the OR connection failed. + CLOSED -- The OR connection closed in an unremarkable way. + + The Reason values for closed/failed OR connections are: + DONE -- The OR connection has shut down cleanly. + CONNECTREFUSED -- We got an ECONNREFUSED while connecting to the target + OR. + IDENTITY -- We connected to the OR, but found that its identity was + not what we expected. + CONNECTRESET -- We got an ECONNRESET or similar IO error from the + connection with the OR. + TIMEOUT -- We got an ETIMEOUT or similar IO error from the connection + with the OR, or we're closing the connection for being idle for too + long. + NOROUTE -- We got an ENOTCONN, ENETUNREACH, ENETDOWN, EHOSTUNREACH, or + similar error while connecting to the OR. + IOERROR -- We got some other IO error on our connection to the OR. + RESOURCELIMIT -- We don't have enough operating system resources (file + descriptors, buffers, etc) to connect to the OR. + MISC -- The OR connection closed for some other reason. + + 4.1.4. Bandwidth used in the last second The syntax is:

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 23 Nov '12

23 Nov '12

commit f32eb1ebd3be14d93552c8a947ef24fc7cb73981 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 16:15:19 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 547c22b..62330c5 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-23 15:45+0000\n" +"PO-Revision-Date: 2012-11-23 15:50+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3666,11 +3666,11 @@ msgstr "Finalizado con éxito" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "No se encontraron dispositivos con UPnP activo" +msgstr "No se encontraron dispositivos con UPnP activado" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" -msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activo" +msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activado" msgctxt "UPNPControl" msgid "WSAStartup failed" @@ -3678,15 +3678,15 @@ msgstr "WSAStartup falló (acceso de la aplicación a protocolos de red en Windo msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "Fallo al agregar un mapeado de puertos" +msgstr "Fallo al agregar un puerto al mapeado" msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "Fallo al recuperar un mapeado de puertos" +msgstr "Fallo al recuperar un puerto del mapeado" msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "Fallo al eliminar un mapeado de puertos" +msgstr "Fallo al eliminar un puerto del mapeado" msgctxt "UPNPControl" msgid "Unknown error" @@ -3694,15 +3694,15 @@ msgstr "Error desconocido" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" -msgstr "Buscando dispositivos UpnP habilitados" +msgstr "Buscando dispositivos con UPnP activado" msgctxt "UPNPTestDialog" msgid "Updating directory port mapping" -msgstr "Actualizando el directorio de mapeo de puertos" +msgstr "Actualizando el mapeado de puertos de la lista de propagación (directory)" msgctxt "UPNPTestDialog" msgid "Updating relay port mapping" -msgstr "Actualizando el mapeo de puertos del repetidor" +msgstr "Actualizando el mapeado de puertos del repetidor" msgctxt "UPNPTestDialog" msgid "Test completed successfully!"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 23 Nov '12

23 Nov '12

commit bf5e19378b9f6f2fa4dd1d97dae0888447e8b22f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 16:15:17 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 547c22b..62330c5 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-23 15:45+0000\n" +"PO-Revision-Date: 2012-11-23 15:50+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3666,11 +3666,11 @@ msgstr "Finalizado con éxito" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "No se encontraron dispositivos con UPnP activo" +msgstr "No se encontraron dispositivos con UPnP activado" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" -msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activo" +msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activado" msgctxt "UPNPControl" msgid "WSAStartup failed" @@ -3678,15 +3678,15 @@ msgstr "WSAStartup falló (acceso de la aplicación a protocolos de red en Windo msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "Fallo al agregar un mapeado de puertos" +msgstr "Fallo al agregar un puerto al mapeado" msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "Fallo al recuperar un mapeado de puertos" +msgstr "Fallo al recuperar un puerto del mapeado" msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "Fallo al eliminar un mapeado de puertos" +msgstr "Fallo al eliminar un puerto del mapeado" msgctxt "UPNPControl" msgid "Unknown error" @@ -3694,15 +3694,15 @@ msgstr "Error desconocido" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" -msgstr "Buscando dispositivos UpnP habilitados" +msgstr "Buscando dispositivos con UPnP activado" msgctxt "UPNPTestDialog" msgid "Updating directory port mapping" -msgstr "Actualizando el directorio de mapeo de puertos" +msgstr "Actualizando el mapeado de puertos de la lista de propagación (directory)" msgctxt "UPNPTestDialog" msgid "Updating relay port mapping" -msgstr "Actualizando el mapeo de puertos del repetidor" +msgstr "Actualizando el mapeado de puertos del repetidor" msgctxt "UPNPTestDialog" msgid "Test completed successfully!"

1 0

[torspec/master] Document stream purposes. Fixes 7508.
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit e23a24a5c481805f1c8a4b4db04d7beee543f887 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:04:25 2012 -0500 Document stream purposes. Fixes 7508. --- control-spec.txt | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 5d12322..5574110 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1432,7 +1432,18 @@ The "PURPOSE" field is provided only for NEW and NEWRESOLVE events, and only if extended events are enabled (see 3.19). Clients MUST accept - purposes not listed above. + purposes not listed above. The purposes above are defined as: + + "DIR_FETCH" -- This stream is generated internally to Tor for + fetching directory information. + "UPLOAD_DESC" -- Obsolete. + "DIR_UPLOAD" -- An internal stream for uploading information to + a directory authority. + "DIRPORT_TEST" -- A stream we're using to test our own directory + port to make sure it's reachable. + "DNS_REQUEST" -- A user-initiated DNS request. + "USER" -- This stream is handling user traffic, OR it's internal + to Tor, but it doesn't match one of the purposes above. 4.1.3. OR Connection status changed

1 0

[torspec/master] Explain algorithm field on directory-signature
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 96427e8daa30e68d1b3cba13220fea84a4e8e842 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 10:51:18 2012 -0500 Explain algorithm field on directory-signature Fix for 7072 --- dir-spec.txt | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 8e389c9..ca5434b 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1532,7 +1532,8 @@ The signature contains the following item, which appears Exactly Once for a vote, and At Least Once for a consensus. - "directory-signature" SP identity SP signing-key-digest NL Signature + "directory-signature" [SP Algorithm] SP identity SP signing-key-digest + NL Signature This is a signature of the status document, with the initial item "network-status-version", and the signature item @@ -1543,6 +1544,20 @@ the signing authority, and "signing-key-digest" is the hex-encoded digest of the current authority signing key of the signing authority. + The Algorithm is one of "sha1" or "sha256" if it is present; + implementations MUST ignore directory-signature entries with an + unrecognized Algorithm. "sha1" is the default, if no Algorithm is + given. The algorithm describes how to compute the hash of the + document before signing it. + + "ns"-flavored consensus documents must contain only sha1 signatures. + Votes and microdescriptor documents may contain other signature + types. Note that only one signature from each authority should be + "counted" as meaning that the authority has signed the consensus. + + (Tor clients before 0.2.3.x did not understand the 'algorithm' + field.) + 3.4. Assigning flags in a vote (This section describes how directory authorities choose which status @@ -2101,6 +2116,9 @@ [*Before consensus method 13, this field was sometimes erroneously omitted.] + Additionally, a microdescriptor consensus MAY use the sha256 digest + algorithm for its signatures. + 3.7. Detached signatures Assuming full connectivity, every authority should compute and sign the

1 0

[tor/master] Minor documentation fix
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 06703f84dfa47e841fdab01bf5cbc32053606656 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 10:51:11 2012 -0500 Minor documentation fix --- src/or/routerparse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 82c062c..0ab99a0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4305,8 +4305,8 @@ router_get_hash_impl_helper(const char *s, size_t s_len, /** Compute the digest of the substring of s taken from the first * occurrence of start_str through the first instance of c after the - * first subsequent occurrence of end_str; store the 20-byte result in - * digest; return 0 on success. + * first subsequent occurrence of end_str; store the 20-byte or 32-byte + * result in digest; return 0 on success. * * If no such substring exists, return -1. */

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 23 Nov '12

23 Nov '12

commit a63bd87da101c57924a6f8084956d4dee3340ff3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 15:45:20 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index afc4c95..547c22b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-23 12:31+0000\n" +"PO-Revision-Date: 2012-11-23 15:45+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3678,15 +3678,15 @@ msgstr "WSAStartup falló (acceso de la aplicación a protocolos de red en Windo msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "Fallo al agregar un mapa de puertos" +msgstr "Fallo al agregar un mapeado de puertos" msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "Fallo al recuperar un mapa de puertos" +msgstr "Fallo al recuperar un mapeado de puertos" msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "Fallo al eliminar el mapeo de puertos" +msgstr "Fallo al eliminar un mapeado de puertos" msgctxt "UPNPControl" msgid "Unknown error"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 23 Nov '12

23 Nov '12

commit f3fc8a1b7615c73919875e924ae06e1839675829 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 15:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index afc4c95..547c22b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-23 12:31+0000\n" +"PO-Revision-Date: 2012-11-23 15:45+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3678,15 +3678,15 @@ msgstr "WSAStartup falló (acceso de la aplicación a protocolos de red en Windo msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "Fallo al agregar un mapa de puertos" +msgstr "Fallo al agregar un mapeado de puertos" msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "Fallo al recuperar un mapa de puertos" +msgstr "Fallo al recuperar un mapeado de puertos" msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "Fallo al eliminar el mapeo de puertos" +msgstr "Fallo al eliminar un mapeado de puertos" msgctxt "UPNPControl" msgid "Unknown error"

1 0