March 2014 - tor-commits - lists.torproject.org

[tor/master] Fix whitespace errors, all of them mine.
by nickm＠torproject.org 05 Mar '14

05 Mar '14

commit 663aba07e5de9c14725e83e0d9c9da0c85e4fc1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 5 14:36:32 2014 -0500 Fix whitespace errors, all of them mine. --- src/common/compat_libevent.c | 1 - src/or/buffers.c | 9 ++++++--- src/test/test_buffers.c | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 61cbe91..8525b4a 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -626,7 +626,6 @@ tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, } #endif - #if defined(LIBEVENT_VERSION_NUMBER) && LIBEVENT_VERSION_NUMBER >= V(2,1,1) \ && !defined(TOR_UNIT_TESTS) void diff --git a/src/or/buffers.c b/src/or/buffers.c index 87e8abf..012ced6 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -235,7 +235,8 @@ chunk_free_unchecked(chunk_t *chunk) #ifdef DEBUG_CHUNK_ALLOC tor_assert(CHUNK_ALLOC_SIZE(chunk->memlen) == chunk->DBG_alloc); #endif - tor_assert(total_bytes_allocated_in_chunks >= CHUNK_ALLOC_SIZE(chunk->memlen)); + tor_assert(total_bytes_allocated_in_chunks >= + CHUNK_ALLOC_SIZE(chunk->memlen)); total_bytes_allocated_in_chunks -= CHUNK_ALLOC_SIZE(chunk->memlen); tor_free(chunk); } @@ -272,7 +273,8 @@ chunk_grow(chunk_t *chunk, size_t sz) tor_assert(chunk->DBG_alloc == CHUNK_ALLOC_SIZE(memlen_orig)); chunk->DBG_alloc = CHUNK_ALLOC_SIZE(sz); #endif - total_bytes_allocated_in_chunks += CHUNK_ALLOC_SIZE(sz) - CHUNK_ALLOC_SIZE(memlen_orig); + total_bytes_allocated_in_chunks += + CHUNK_ALLOC_SIZE(sz) - CHUNK_ALLOC_SIZE(memlen_orig); return chunk; } @@ -339,7 +341,8 @@ buf_shrink_freelists(int free_all) #ifdef DEBUG_CHUNK_ALLOC tor_assert(chunk->DBG_alloc == CHUNK_ALLOC_SIZE(chunk->memlen)); #endif - tor_assert(total_bytes_allocated_in_chunks >= CHUNK_ALLOC_SIZE(chunk->memlen)); + tor_assert(total_bytes_allocated_in_chunks >= + CHUNK_ALLOC_SIZE(chunk->memlen)); total_bytes_allocated_in_chunks -= CHUNK_ALLOC_SIZE(chunk->memlen); total_freed += CHUNK_ALLOC_SIZE(chunk->memlen); tor_free(chunk); diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index a410770..6dd7715 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -492,7 +492,6 @@ test_buffer_allocation_tracking(void *arg) tt_int_op(buf_allocation(buf2), ==, 8192); /* another 4k chunk. */ tt_int_op(buf_get_total_allocation(), ==, 5*4096); /* that chunk was new. */ - /* Make a really huge buffer */ for (i = 0; i < 1000; ++i) { write_to_buf(junk, 4000, buf2);

1 0

[torspec/master] Merge remote-tracking branch 'karsten/bug8913'
by nickm＠torproject.org 05 Mar '14

05 Mar '14

commit 00ecf4eb994e6e50cab016817e550f01b7a73fcf Merge: 426e9ac 6a3612c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 5 13:25:40 2014 -0500 Merge remote-tracking branch 'karsten/bug8913' dir-spec.txt | 44 ++++++++++---------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-)

1 0

[torspec/master] Stop pretending that v2 directories are a thing
by nickm＠torproject.org 05 Mar '14

05 Mar '14

commit 66e22ce9336b65e050314a7cae9aebb707990f16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 16:04:11 2014 -0500 Stop pretending that v2 directories are a thing --- dir-spec.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index a594948..507c9c2 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -8,10 +8,6 @@ 0.1.0.x series, and dir-spec-v2.txt for information on the protocol used by the 0.1.1.x and 0.1.2.x series. - Caches and authorities must still support older versions of the - directory protocols, until the versions of Tor that require them are - finally out of commission. - This document merges and supersedes the following proposals: 101 Voting on the Tor Directory System @@ -182,10 +178,6 @@ All directory information is uploaded and downloaded with HTTP. - [Authorities also generate and caches also cache documents produced and - used by earlier versions of this protocol; see dir-spec-v1.txt and - dir-spec-v2.txt for notes on those versions.] - 1.1. What's different from version 2? Clients used to download multiple network status documents, @@ -741,7 +733,9 @@ unique IP addresses that have connected from that country to request a v2/v3 network status, rounded up to the nearest multiple of 8. Only those IP addresses are counted that the directory can - answer with a 200 OK status code. + answer with a 200 OK status code. (Note here and below: current Tor + versions, as of 0.2.5.2-alpha, no longer cache or serve v2 + networkstatus documents.) "dirreq-v2-reqs" CC=N,CC=N,... NL [At most once.] @@ -2597,7 +2591,7 @@ When a client has no consensus network-status document, it downloads it from a randomly chosen authority. In all other cases, the client - downloads from caches randomly chosen from among those believed to be V2 + downloads from caches randomly chosen from among those believed to be V3 directory servers. (This information comes from the network-status documents; see 6 below.) @@ -2751,9 +2745,6 @@ - Clients SHOULD NOT choose non-'Guard' nodes when picking entry guard nodes. - - Clients SHOULD NOT download directory information from non-'V2Dir' - caches. - See the "path-spec.txt" document for more details. 5.4.2. Managing naming

1 0

[torspec/master] V2Dir really means version 2 or higher.
by nickm＠torproject.org 05 Mar '14

05 Mar '14

commit 82e1be72da14288a5c328239879a635fafe9c9ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Feb 8 09:14:00 2014 +0100 V2Dir really means version 2 or higher. --- dir-spec.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 507c9c2..c328b25 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1607,7 +1607,8 @@ "Unnamed" if another router has bound the name used by this router, and this authority binds names. "Valid" if the router has been 'validated'. - "V2Dir" if the router implements the v2 directory protocol. + "V2Dir" if the router implements the v2 directory protocol or + higher. "v" SP version NL @@ -1846,10 +1847,10 @@ "Authority" -- A router is called an 'Authority' if the authority generating the network-status document believes it is an authority. - "V2Dir" -- A router supports the v2 directory protocol if it has an open - directory port, and it is running a version of the directory protocol that - supports the functionality clients need. (Currently, this is - 0.1.1.9-alpha or later.) + "V2Dir" -- A router supports the v2 directory protocol or higher if it has + an open directory port, and it is running a version of the directory + protocol that supports the functionality clients need. (Currently, this + is 0.1.1.9-alpha or later.) "HSDir" -- A router is a v2 hidden service directory if it stores and serves v2 hidden service descriptors, and the authority believes that it's

1 0

[torspec/master] Remove now obsolete backward compatibility and migration plans.
by nickm＠torproject.org 05 Mar '14

05 Mar '14

commit 6a3612cc562a7adce2eddd65b10ca86955cadade Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Feb 8 09:14:43 2014 +0100 Remove now obsolete backward compatibility and migration plans. --- dir-spec.txt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index c328b25..b2da016 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2858,22 +2858,6 @@ -- user requested some items that we ordinarily generate or store, but we do not have any available. -7. Backward compatibility and migration plans - - Until Tor versions before 0.1.1.x are completely obsolete, directory - authorities should generate, and mirrors should download and cache, v1 - directories and running-routers lists, and allow old clients to download - them. These documents and the rules for retrieving, serving, and caching - them are described in dir-spec-v1.txt. - - Until Tor versions before 0.2.0.x are completely obsolete, directory - authorities should generate, mirrors should download and cache, v2 - network-status documents, and allow old clients to download them. - Additionally, all directory servers and caches should download, store, and - serve any router descriptor that is required because of v2 network-status - documents. These documents and the rules for retrieving, serving, and - caching them are described in dir-spec-v1.txt. - A. Consensus-negotiation timeline. Period begins: this is the Published time.

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 05 Mar '14

05 Mar '14

commit 190f56ca63e37755c66d1876843478b3562f3cd6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 5 18:15:24 2014 +0000 Update translations for tails-greeter_completed --- fr_CA/fr_CA.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 63d38de..dc723b5 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 17:42+0000\n" +"PO-Revision-Date: 2014-03-05 17:50+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 05 Mar '14

05 Mar '14

commit 3baa80fce137131a318b6d1a7cddecc4adfffd51 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 5 18:15:22 2014 +0000 Update translations for tails-greeter --- fr_CA/fr_CA.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 63d38de..dc723b5 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 17:42+0000\n" +"PO-Revision-Date: 2014-03-05 17:50+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 05 Mar '14

05 Mar '14

commit a4fadbba14cfd57c3f567339341c487194c56247 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 5 17:45:52 2014 +0000 Update translations for torbutton-torbuttondtd --- fr_CA/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd index 296d3c3..a41ec7a 100644 --- a/fr_CA/torbutton.dtd +++ b/fr_CA/torbutton.dtd @@ -73,7 +73,7 @@ <!ENTITY torbutton.prefs.disable_sessionstore "Désactiver la sauvegarde de session (recommandé)"> <!ENTITY torbutton.prefs.headers "Entêtes"> <!ENTITY torbutton.prefs.spoof_english "Imiter un navigateur anglais É.U."> -<!ENTITY torbutton.prefs.refererspoofing "Imitation du référent"> +<!ENTITY torbutton.prefs.refererspoofing "Usurpation du référent"> <!ENTITY torbutton.prefs.spoofblank "Imiter un référent vide durant l'utilisation de Tor (peut briser certains sites)"> <!ENTITY torbutton.prefs.smartspoof "Imitation intelligente du référent lorsque Tor est actif (imite les référents à domaines croisés)"> <!ENTITY torbutton.prefs.nospoof "Pas d'imitation de référent durant l'utilisation de Tor (envoi des référents normaux)"> @@ -115,7 +115,7 @@ <!ENTITY torbutton.prefs.no_proxies_on "Aucun mandataire pour : "> <!ENTITY torbutton.prefs.no_proxy_warning "Avertissement : évitez d'utiliser les noms d'hôtes ci-dessus"> <!ENTITY torbutton.prefs.spoofreresh "Rafraîchir l'imitation"> -<!ENTITY torbutton.prefs.refereroptions "Options d'imitation du référent"> +<!ENTITY torbutton.prefs.refereroptions "Options d'Usurpation du référent"> <!ENTITY torbutton.prefs.nospoof "Pas d'imitation de référent durant l'utilisation de Tor (envoi des référents normaux)"> <!ENTITY torbutton.prefs.spoofroot "Imiter le dossier contenant la page"> <!ENTITY torbutton.prefs.spoofdomain "Imiter le domaine comme référent">

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 05 Mar '14

05 Mar '14

commit efa95615df3d29ba9083556b6c70b843736d1432 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 5 17:45:27 2014 +0000 Update translations for tails-greeter_completed --- fr_CA/fr_CA.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 1c4a45c..63d38de 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-21 19:40+0100\n" -"PO-Revision-Date: 2014-03-01 17:00+0000\n" +"POT-Creation-Date: 2014-03-04 11:11+0100\n" +"PO-Revision-Date: 2014-03-05 17:42+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -117,8 +117,8 @@ msgid "MAC address spoofing" msgstr "Usurpation d'adresse MAC" #: ../glade/optionswindow.glade.h:15 -msgid "<a href=\"doc/advanced_topics/mac_changer.en.html\">Help</a>" -msgstr "<a href=\"doc/advanced_topics/mac_changer.en.html\">Aide</a>" +msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Aide</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -129,8 +129,8 @@ msgstr "L'usurpation des adresses MAC cache le numéro de série de vos cartes r #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " -"suspicion or cause network connection problems. See the documentation." -msgstr "Il est généralement plus sécuritaire d'usurper les adresses MAC mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau. Voir la documentation." +"suspicion or cause network connection problems." +msgstr "Il est généralement plus sécuritaire d'usurper les adresses MAC mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 05 Mar '14

05 Mar '14

commit 95b7513a035b1ad1816404b8bf48a974155df473 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 5 17:45:22 2014 +0000 Update translations for tails-greeter --- fr_CA/fr_CA.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 1ea7755..63d38de 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-05 17:42+0000\n" +"Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -118,7 +118,7 @@ msgstr "Usurpation d'adresse MAC" #: ../glade/optionswindow.glade.h:15 msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Aide</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -130,7 +130,7 @@ msgstr "L'usurpation des adresses MAC cache le numéro de série de vos cartes r msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "" +msgstr "Il est généralement plus sécuritaire d'usurper les adresses MAC mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses"

1 0