September 2013 - tor-commits - lists.torproject.org

[torbrowser/master] update beta TBBs to Tor 0.2.4.12-rc (closes: #9677)
by erinn＠torproject.org 05 Sep '13

05 Sep '13

commit 2958cdb9d62e435c5f5a625085e00753b8568cb5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 5 14:34:29 2013 +0200 update beta TBBs to Tor 0.2.4.12-rc (closes: #9677) --- README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/versions-alpha.mk | 8 ++++---- changelog.linux-2.4 | 8 ++++++++ changelog.osx-2.4 | 8 ++++++++ changelog.windows-2.4 | 8 ++++++++ 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index b4bba77..bd24c34 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.16-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.8esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 - |_ HTTPS-Everywhere 4.0development.9 + |_ NoScript 2.6.7.1 + |_ HTTPS-Everywhere 4.0development.11 |_ PDF Viewer 0.8.298 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index b392951..3eff280 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.16-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.8esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 - |_ HTTPS-Everywhere 4.0development.9 + |_ NoScript 2.6.7.1 + |_ HTTPS-Everywhere 4.0development.11 |_ PDF Viewer 0.8.298 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 51c6463..968b483 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.16-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.8esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 - |_ HTTPS-Everywhere 4.0development.9 + |_ NoScript 2.6.7.1 + |_ HTTPS-Everywhere 4.0development.11 |_ PDF Viewer 0.8.298 Usage diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 5fe4f44..3d7d050 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.16-beta +RELEASE_VER=2.4.17-beta ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k @@ -8,13 +8,13 @@ LIBPNG_VER=1.5.16 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable -TOR_VER=0.2.4.16-rc +TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.8esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7 -HTTPSEVERYWHERE_VER=4.0development.9 +NOSCRIPT_VER=2.6.7.1 +HTTPSEVERYWHERE_VER=4.0development.11 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index ac28e11..fa7da5e 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.17-beta-1); suite=linux + + * Update Tor to 0.2.4.17-rc + * Update NoScript to 2.6.7.1 + * Update HTTPS Everywhere to 4.0development.11 + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 5 14:26:06 CEST 2013 + Tor Browser Bundle (2.4.16-beta-1); suite=linux * Update Tor to 0.2.4.16-rc diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 90f49d5..c99d531 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.17-beta-1); suite=osx + + * Update Tor to 0.2.4.17-rc + * Update NoScript to 2.6.7.1 + * Update HTTPS Everywhere to 4.0development.11 + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 5 14:26:04 CEST 2013 + Tor Browser Bundle (2.4.16-beta-1); suite=osx * Update Tor to 0.2.4.16-rc diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index de7a0a0..4c7881d 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.17-beta-1); suite=windows + + * Update Tor to 0.2.4.17-rc + * Update NoScript to 2.6.7.1 + * Update HTTPS Everywhere to 4.0development.11 + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 5 14:26:09 CEST 2013 + Tor Browser Bundle (2.4.16-beta-1); suite=windows * Update Tor to 0.2.4.16-rc

1 0

r26341: {website} 0.2.4.17-rc tarball is out (in website/trunk: . include)
by Roger Dingledine 05 Sep '13

05 Sep '13

Author: arma Date: 2013-09-05 09:41:14 +0000 (Thu, 05 Sep 2013) New Revision: 26341 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.4.17-rc tarball is out Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2013-09-05 02:41:15 UTC (rev 26340) +++ website/trunk/Makefile 2013-09-05 09:41:14 UTC (rev 26341) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.3.25 -export DEVTAG=tor-0.2.4.16-rc +export DEVTAG=tor-0.2.4.17-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-09-05 02:41:15 UTC (rev 26340) +++ website/trunk/include/versions.wmi 2013-09-05 09:41:14 UTC (rev 26341) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-alpha whitespace=delete>0.2.4.16-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.4.16-rc</define-tag>

1 0

[doctor/java] Add new NumNTorsPerTAP consensus parameter.
by karsten＠torproject.org 05 Sep '13

05 Sep '13

commit 1573955afa186ebeeab9acf5206e1fdd7ddb3f7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 5 11:22:09 2013 +0200 Add new NumNTorsPerTAP consensus parameter. --- src/org/torproject/doctor/Checker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index d5fd734..dca7ace 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -267,8 +267,8 @@ public class Checker { + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," + "cbtmintimeout,cbtinitialtimeout,perconnbwburst,perconnbwrate," - + "UseOptimisticData,pb_disablepct,UseNTorHandshake"). - split(","))); + + "UseOptimisticData,pb_disablepct,UseNTorHandshake," + + "NumNTorsPerTAP").split(","))); SortedSet<String> conflicts = new TreeSet<String>(); for (RelayNetworkStatusVote vote : this.downloadedVotes) { Map<String, Integer> voteConsensusParams =

1 0

[tor/master] don't let recently_chosen_ntors overflow
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit e443beffeb8c20dddeb198cf94667a82f4cb53c7 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 01:27:46 2013 -0400 don't let recently_chosen_ntors overflow with commit c6f1668d we let it grow arbitrarily large. it can still overflow, but the damage is very small now. --- src/or/onion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/onion.c b/src/or/onion.c index 41fe7b6..8e3e487 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -212,7 +212,7 @@ static uint16_t decide_next_handshake_type(void) { /* The number of times we've chosen ntor lately when both were available. */ - static int recently_chosen_ntors = 0; + static unsigned int recently_chosen_ntors = 0; if (!ol_entries[ONION_HANDSHAKE_TYPE_NTOR]) return ONION_HANDSHAKE_TYPE_TAP; /* no ntors? try tap */

1 0

[tor/master] Revert e443beff and solve it a different way
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit f51add6dbcef073d3ba57df13eee3c99d647fde9 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 01:41:07 2013 -0400 Revert e443beff and solve it a different way Now we explicitly check for overflow. This approach seemed smarter than a cascade of "change int to unsigned int and hope nothing breaks right before the release". Nick, feel free to fix in a better way, maybe in master. --- src/or/onion.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index 8e3e487..1a0bcf1 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -212,7 +212,7 @@ static uint16_t decide_next_handshake_type(void) { /* The number of times we've chosen ntor lately when both were available. */ - static unsigned int recently_chosen_ntors = 0; + static int recently_chosen_ntors = 0; if (!ol_entries[ONION_HANDSHAKE_TYPE_NTOR]) return ONION_HANDSHAKE_TYPE_TAP; /* no ntors? try tap */ @@ -227,7 +227,8 @@ decide_next_handshake_type(void) * got here first. In any case this edge case will only become relevant * once tap is rare. We should reevaluate whether we like this decision * once tap gets more rare. */ - if (ol_entries[ONION_HANDSHAKE_TYPE_NTOR]) + if (ol_entries[ONION_HANDSHAKE_TYPE_NTOR] && + recently_chosen_ntors <= num_ntors_per_tap()) ++recently_chosen_ntors; return ONION_HANDSHAKE_TYPE_NTOR; /* no taps? try ntor */

1 0

[tor/master] Merge branch 'maint-0.2.4'
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 86907ea4db5067d1fbf56275457a919d6789ba95 Merge: 6156887 2c877d2 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 02:34:58 2013 -0400 Merge branch 'maint-0.2.4' changes/ticket9658 | 4 ++++ src/or/command.c | 3 +++ src/or/cpuworker.c | 5 +++++ src/or/main.c | 5 +++++ src/or/onion.c | 3 ++- src/or/rephist.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 8 ++++++-- 7 files changed, 66 insertions(+), 3 deletions(-)

1 0

[tor/master] collect and log statistics about onionskins received/processed
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 2c877d2da4a989639311de11e4ada8dd03bc8187 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 4 17:43:15 2013 -0400 collect and log statistics about onionskins received/processed we skip onionskins that came from non-relays, so we're less likely to run into privacy troubles. starts to implement ticket 9658. --- changes/ticket9658 | 4 ++++ src/or/command.c | 3 +++ src/or/cpuworker.c | 5 +++++ src/or/main.c | 5 +++++ src/or/rephist.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 8 ++++++-- 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/changes/ticket9658 b/changes/ticket9658 new file mode 100644 index 0000000..a8db2ef --- /dev/null +++ b/changes/ticket9658 @@ -0,0 +1,4 @@ + o Minor features: + - Track how many "TAP" and "NTor" circuit handshake requests we get, + and how many we complete, and log it every hour to help relay + operators follow trends in network load. Addresses ticket 9658. diff --git a/src/or/command.c b/src/or/command.c index 876ff52..699b02f 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -29,6 +29,7 @@ #include "hibernate.h" #include "nodelist.h" #include "onion.h" +#include "rephist.h" #include "relay.h" #include "router.h" #include "routerlist.h" @@ -277,6 +278,8 @@ command_process_create_cell(cell_t *cell, channel_t *chan) if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) { /* hand it off to the cpuworkers, and then return. */ + if (connection_or_digest_is_known_relay(chan->identity_digest)) + rep_hist_note_circuit_handshake_requested(create_cell->handshake_type); if (assign_onionskin_to_cpuworker(NULL, circ, create_cell) < 0) { log_debug(LD_GENERAL,"Failed to hand off onionskin. Closing."); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 61f9faa..ecf0d20 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -19,9 +19,11 @@ #include "circuitlist.h" #include "config.h" #include "connection.h" +#include "connection_or.h" #include "cpuworker.h" #include "main.h" #include "onion.h" +#include "rephist.h" #include "router.h" /** The maximum number of cpuworker processes we will keep around. */ @@ -683,6 +685,9 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker, return -1; } + if (connection_or_digest_is_known_relay(circ->p_chan->identity_digest)) + rep_hist_note_circuit_handshake_completed(onionskin->handshake_type); + should_time = should_time_request(onionskin->handshake_type); memset(&req, 0, sizeof(req)); req.magic = CPUWORKER_REQUEST_MAGIC; diff --git a/src/or/main.c b/src/or/main.c index bd23141..deed798 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1353,6 +1353,11 @@ run_scheduled_events(time_t now) next_time_to_write_stats_files = next_write; } time_to_write_stats_files = next_time_to_write_stats_files; + + /* Also commandeer this opportunity to log how our circuit handshake + * stats have been doing. */ + if (public_server_mode(options)) + rep_hist_log_circuit_handshake_stats(now); } /* 1h. Check whether we should write bridge statistics to disk. diff --git a/src/or/rephist.c b/src/or/rephist.c index 55f321d..131e531 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3011,6 +3011,47 @@ rep_hist_conn_stats_write(time_t now) return start_of_conn_stats_interval + WRITE_STATS_INTERVAL; } +/** Internal statistics to track how many requests of each type of + * handshake we've received, and how many we've completed. Useful for + * seeing trends in cpu load. + * @{ */ +static int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; +static int onion_handshakes_completed[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; +/**@}*/ + +/** A new onionskin (using the <b>type</b> handshake) has arrived. */ +void +rep_hist_note_circuit_handshake_requested(uint16_t type) +{ + if (type <= MAX_ONION_HANDSHAKE_TYPE) + onion_handshakes_requested[type]++; +} + +/** We've sent an onionskin (using the <b>type</b> handshake) to a + * cpuworker. */ +void +rep_hist_note_circuit_handshake_completed(uint16_t type) +{ + if (type <= MAX_ONION_HANDSHAKE_TYPE) + onion_handshakes_completed[type]++; +} + +/** Log our onionskin statistics since the last time we were called. */ +void +rep_hist_log_circuit_handshake_stats(time_t now) +{ + (void)now; + /* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */ + log_notice(LD_HIST, "Circuit handshake stats since last time: " + "%d/%d TAP, %d/%d NTor.", + onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], + onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], + onion_handshakes_completed[ONION_HANDSHAKE_TYPE_NTOR], + onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR]); + memset(onion_handshakes_completed, 0, sizeof(onion_handshakes_completed)); + memset(onion_handshakes_requested, 0, sizeof(onion_handshakes_requested)); +} + /** Free all storage held by the OR/link history caches, by the * bandwidth history arrays, by the port history, or by statistics . */ void diff --git a/src/or/rephist.h b/src/or/rephist.h index 811cd8d..de82474 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -64,8 +64,6 @@ int rep_hist_circbuilding_dormant(time_t now); void note_crypto_pk_op(pk_op_t operation); void dump_pk_ops(int severity); -void rep_hist_free_all(void); - void rep_hist_exit_stats_init(time_t now); void rep_hist_reset_exit_stats(time_t now); void rep_hist_exit_stats_term(void); @@ -98,5 +96,11 @@ char *rep_hist_format_conn_stats(time_t now); time_t rep_hist_conn_stats_write(time_t now); void rep_hist_conn_stats_term(void); +void rep_hist_note_circuit_handshake_requested(uint16_t type); +void rep_hist_note_circuit_handshake_completed(uint16_t type); +void rep_hist_log_circuit_handshake_stats(time_t now); + +void rep_hist_free_all(void); + #endif

1 0

[tor/release-0.2.4] give it a blurb and touch up the changelog stanzas
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 00fb525b23cf070fb229e1073caae47e6401f1e2 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 02:32:02 2013 -0400 give it a blurb and touch up the changelog stanzas --- ChangeLog | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f237e27..1faa2b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -Changes in version 0.2.4.17-rc - 2013-09-0x +Changes in version 0.2.4.17-rc - 2013-09-05 + Tor 0.2.4.17-rc is the third release candidate for the Tor 0.2.4.x + series. It adds an emergency step to help us tolerate the massive + influx of users: 0.2.4 clients using the new (faster and safer) "NTor" + circuit-level handshakes now effectively jump the queue compared to + the 0.2.3 clients using "TAP" handshakes. This release also fixes a + big bug hindering bridge reachability tests. o Major features: - Relays now process the new "NTor" circuit-level handshake requests @@ -15,20 +21,19 @@ Changes in version 0.2.4.17-rc - 2013-09-0x - Bridges now send AUTH_CHALLENGE cells during their v3 handshakes; previously they did not, which prevented them from receiving successful connections from relays for self-test or bandwidth - testing. Fixes bug 9546; bugfix on 0.2.3.6-alpha. - - When a relay is extending a circuit to a bridge, it needs to send a - NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE - cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha. + testing. Also, when a relay is extending a circuit to a bridge, + it needs to send a NETINFO cell, even when the bridge hasn't sent + an AUTH_CHALLENGE cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha. - If the time to download the next old-style networkstatus is in the future, do not decline to consider whether to download the next microdescriptor networkstatus. Fixes bug 9564; bugfix on 0.2.3.14-alpha. o Minor bugfixes: - - Avoid double-closing the listener socket in our socketpair + - Avoid double-closing the listener socket in our socketpair() replacement (used on Windows) in the case where the addresses on our opened sockets don't match what we expected. Fixes bug 9400; - bugfix on every released Tor version. Found by Coverity. + bugfix on 0.0.2pre7. Found by Coverity. o Minor fixes (config options): - Avoid overflows when the user sets MaxCircuitDirtiness to a

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit 03a0086c0936daa1735d306bb3adf475add935f1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 06:16:36 2013 +0000 Update translations for torbirdy_completed --- pt_BR/torbirdy.dtd | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index d30399d..76188e6 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -12,15 +12,17 @@ <!ENTITY torbirdy.prefs.save.button "Salvar"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> -<!ENTITY torbirdy.prefs.extra2.button "Testar Configurações"> +<!ENTITY torbirdy.prefs.extra1.button "Restaurar configurações padrão"> +<!ENTITY torbirdy.prefs.extra1.key "d"> +<!ENTITY torbirdy.prefs.extra2.button "Testar as Configurações do Proxy"> <!ENTITY torbirdy.prefs.extra2.key "c"> <!ENTITY torbirdy.prefs.proxy.label "Configurações de Proxy"> <!ENTITY torbirdy.prefs.privacy.label "Configurações de Privacidade"> <!ENTITY torbirdy.prefs.enigmail.label "Configurações do Enigmail"> <!ENTITY torbirdy.prefs.security.label "Configurações de segurança"> -<!ENTITY torbirdy.prefs.recommended.text "Utilize as configurações de proxy recomendadas pelo TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Utilizar as configurações de proxy recomendadas pelo TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> -<!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimação"> +<!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimato"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "Usar configurações de proxy personalizadas"> <!ENTITY torbirdy.prefs.customsettings.key "p"> @@ -32,17 +34,19 @@ <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Geral"> <!ENTITY torbirdy.prefs.imap.label "Ativar suporte a download de emails via IMAP [padrão: desativado]"> -<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Abrir a última pasta acessada ao iniciar [padrão: desativado, será selecionada a Pasta Local]"> <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Não defina o fuso horário do Thunderbird para UTC [padrão: definido para UTC]"> <!ENTITY torbirdy.prefs.timezone.key "f"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Colocar o ID do destinatário em mensagens criptografadas [padrão: não colocar]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "l"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não colocar a ID dos destinatários em mensagens criptografadas [padrão: colocar]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar email se Enigmail estiver ativado [padrão: não confirmar]"> -<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Ativar o assistente de configuração de email do Thunderbird [padrão: desativar]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "Verifica automaticamente novas mensagens em todas contas [padrão: desabilitado]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "Permitir conexões a servidores que não suportam SSL/TLS com negociação segura [padrão: não permitir]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Configurações da Conta">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit d9c58065bb795f93fdf0adaf76aad0978f67b560 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 06:16:32 2013 +0000 Update translations for torbirdy --- pt_BR/torbirdy.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index 558ba01..76188e6 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -42,11 +42,11 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não colocar a ID dos destinatários em mensagens criptografadas [padrão: colocar]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar email se Enigmail estiver ativado [padrão: não confirmar]"> -<!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Ativar o assistente de configuração de email do Thunderbird [padrão: desativar]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.automatic.label ""> -<!ENTITY torbirdy.prefs.automatic.key ""> +<!ENTITY torbirdy.prefs.automatic.label "Verifica automaticamente novas mensagens em todas contas [padrão: desabilitado]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "Permitir conexões a servidores que não suportam SSL/TLS com negociação segura [padrão: não permitir]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Configurações da Conta">

1 0