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

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 21 Mar '13

21 Mar '13

commit 9bd05a74b68be20d0e10acf9db671865d6ab6277 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 14:46:16 2013 +0000 Update translations for torbirdy --- nb/torbirdy.dtd | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd index 9ff8df9..56a02e0 100644 --- a/nb/torbirdy.dtd +++ b/nb/torbirdy.dtd @@ -16,8 +16,8 @@ <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Proxy innstillinger"> <!ENTITY torbirdy.prefs.privacy.label "Personvern Innstillinger"> -<!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Innstillinger"> +<!ENTITY torbirdy.prefs.security.label "Sikkerhetsinnstillinger"> <!ENTITY torbirdy.prefs.recommended.text "Bruk de anbefalte proxyinnstillingene for TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Velg en anonymiseringstjeneste"> @@ -43,13 +43,13 @@ <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "Aktiver Thunderbirds automatiske konfigureringshjelp [standard: deaktivert]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.renegotiation.label ""> -<!ENTITY torbirdy.prefs.renegotiation.key ""> +<!ENTITY torbirdy.prefs.renegotiation.label "Tillat tilkoblinger til servere som ikke støtter SSL/TLS med sikker renegotiation [standard: ikke tillat]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Kontospesifikt"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Velg en konto:"> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label ""> -<!ENTITY torbirdy.prefs.enigmail.keyserver.key ""> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Bruk følgende keyserver(e):"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Bruk Tor Onion Router"> <!ENTITY torbirdy.panel.usejondo.label "Bruk JonDo (Premium)">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 21 Mar '13

21 Mar '13

commit f447be006683bf2a0cee9da91fc0bd77b12bfc50 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 14:46:07 2013 +0000 Update translations for https_everywhere_completed --- nb/https-everywhere.properties | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/nb/https-everywhere.properties b/nb/https-everywhere.properties index afc0bc0..129dbdb 100644 --- a/nb/https-everywhere.properties +++ b/nb/https-everywhere.properties @@ -3,3 +3,4 @@ https-everywhere.menu.globalDisable = Deaktiver HTTPS Everywhere https-everywhere.menu.enableDisable = Aktiver / Deaktiver Regler https-everywhere.menu.noRules = (Ingen regler for denne siden) https-everywhere.menu.unknownRules = (Reglene for denne siden er ukjente) +https-everywhere.toolbar.hint = HTTPS Everywhere er nå aktiv. Du kan aktivere/deaktivere fra side til side ved å klikke på ikonet i adresselinjen.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 21 Mar '13

21 Mar '13

commit eee02a514f01421fd1034cc7db4b228c119153d9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 14:46:00 2013 +0000 Update translations for https_everywhere --- nb/https-everywhere.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nb/https-everywhere.properties b/nb/https-everywhere.properties index f5c5c71..129dbdb 100644 --- a/nb/https-everywhere.properties +++ b/nb/https-everywhere.properties @@ -3,4 +3,4 @@ https-everywhere.menu.globalDisable = Deaktiver HTTPS Everywhere https-everywhere.menu.enableDisable = Aktiver / Deaktiver Regler https-everywhere.menu.noRules = (Ingen regler for denne siden) https-everywhere.menu.unknownRules = (Reglene for denne siden er ukjente) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.toolbar.hint = HTTPS Everywhere er nå aktiv. Du kan aktivere/deaktivere fra side til side ved å klikke på ikonet i adresselinjen.

1 0

[tor/master] Fix a small memory leak in the unit tests
by nickm＠torproject.org 21 Mar '13

21 Mar '13

commit 42fb61d172b172687cd57c86dd72b117f03f2136 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:52:36 2013 -0400 Fix a small memory leak in the unit tests Found by coverity; this is CID 992692. --- src/test/test_util.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7ab54e1..2c4f804 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -802,7 +802,7 @@ test_util_strmisc(void) { char buf[1024]; int i; - char *cp; + char *cp, *cp_tmp; /* Test strl operations */ test_eq(5, strlcpy(buf, "Hello", 0)); @@ -1005,20 +1005,20 @@ test_util_strmisc(void) /* Test strndup and memdup */ { const char *s = "abcdefghijklmnopqrstuvwxyz"; - cp = tor_strndup(s, 30); - test_streq(cp, s); /* same string, */ - test_neq_ptr(cp, s); /* but different pointers. */ - tor_free(cp); + cp_tmp = tor_strndup(s, 30); + test_streq(cp_tmp, s); /* same string, */ + test_neq_ptr(cp_tmp, s); /* but different pointers. */ + tor_free(cp_tmp); - cp = tor_strndup(s, 5); - test_streq(cp, "abcde"); - tor_free(cp); + cp_tmp = tor_strndup(s, 5); + test_streq(cp_tmp, "abcde"); + tor_free(cp_tmp); s = "a\0b\0c\0d\0e\0"; - cp = tor_memdup(s,10); - test_memeq(cp, s, 10); /* same ram, */ - test_neq_ptr(cp, s); /* but different pointers. */ - tor_free(cp); + cp_tmp = tor_memdup(s,10); + test_memeq(cp_tmp, s, 10); /* same ram, */ + test_neq_ptr(cp_tmp, s); /* but different pointers. */ + tor_free(cp_tmp); } /* Test str-foo functions */ @@ -1097,7 +1097,7 @@ test_util_strmisc(void) tt_int_op(strcmp_len("blah", "", 0), ==, 0); done: - ; + tor_free(cp_tmp); } static void

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 21 Mar '13

21 Mar '13

commit 294c89f238df2c7feb1f2fba0bf3a3ad824acfee Merge: e9ffd98 42fb61d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:53:46 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/test/test_util.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)

1 0

[tor/maint-0.2.4] Fix a small memory leak in the unit tests
by nickm＠torproject.org 21 Mar '13

21 Mar '13

commit 42fb61d172b172687cd57c86dd72b117f03f2136 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:52:36 2013 -0400 Fix a small memory leak in the unit tests Found by coverity; this is CID 992692. --- src/test/test_util.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7ab54e1..2c4f804 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -802,7 +802,7 @@ test_util_strmisc(void) { char buf[1024]; int i; - char *cp; + char *cp, *cp_tmp; /* Test strl operations */ test_eq(5, strlcpy(buf, "Hello", 0)); @@ -1005,20 +1005,20 @@ test_util_strmisc(void) /* Test strndup and memdup */ { const char *s = "abcdefghijklmnopqrstuvwxyz"; - cp = tor_strndup(s, 30); - test_streq(cp, s); /* same string, */ - test_neq_ptr(cp, s); /* but different pointers. */ - tor_free(cp); + cp_tmp = tor_strndup(s, 30); + test_streq(cp_tmp, s); /* same string, */ + test_neq_ptr(cp_tmp, s); /* but different pointers. */ + tor_free(cp_tmp); - cp = tor_strndup(s, 5); - test_streq(cp, "abcde"); - tor_free(cp); + cp_tmp = tor_strndup(s, 5); + test_streq(cp_tmp, "abcde"); + tor_free(cp_tmp); s = "a\0b\0c\0d\0e\0"; - cp = tor_memdup(s,10); - test_memeq(cp, s, 10); /* same ram, */ - test_neq_ptr(cp, s); /* but different pointers. */ - tor_free(cp); + cp_tmp = tor_memdup(s,10); + test_memeq(cp_tmp, s, 10); /* same ram, */ + test_neq_ptr(cp_tmp, s); /* but different pointers. */ + tor_free(cp_tmp); } /* Test str-foo functions */ @@ -1097,7 +1097,7 @@ test_util_strmisc(void) tt_int_op(strcmp_len("blah", "", 0), ==, 0); done: - ; + tor_free(cp_tmp); } static void

1 0

[tor/master] Remove check for whether bridge_line->digest is NULL
by nickm＠torproject.org 21 Mar '13

21 Mar '13

commit e9ffd9890f6073bc2fc3be36be2fd521a4f3af96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:47:42 2013 -0400 Remove check for whether bridge_line->digest is NULL It can never be NULL, since it's an array in bridge_line_t. Introduced in 266f8cddd87f. Found by coverity; this is CID 992691. Bug not in any released Tor. --- src/or/entrynodes.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 1ce78e5..48eb309 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1766,8 +1766,7 @@ bridge_add_from_config(bridge_line_t *bridge_line) b = tor_malloc_zero(sizeof(bridge_info_t)); tor_addr_copy(&b->addr, &bridge_line->addr); b->port = bridge_line->port; - if (bridge_line->digest) - memcpy(b->identity, bridge_line->digest, DIGEST_LEN); + memcpy(b->identity, bridge_line->digest, DIGEST_LEN); if (bridge_line->transport_name) b->transport_name = bridge_line->transport_name; b->fetch_status.schedule = DL_SCHED_BRIDGE;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 21 Mar '13

21 Mar '13

commit ea6d53e7246cb66efc054b5f5a235000c528eff5 Merge: 7c2eabc 6196d0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:25:24 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/entrynodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] The *default* guard lifetime is two months; the *min* is one
by nickm＠torproject.org 21 Mar '13

21 Mar '13

commit 6196d0e83d78e2e8efff575d490f4cb254415832 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:22:59 2013 -0400 The *default* guard lifetime is two months; the *min* is one This caused an assertion failure when pruning guards. Fixes bug #8553; bug not in any released Tor. --- src/or/entrynodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 5bb0a73..6b21d10 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -459,8 +459,8 @@ static int32_t guards_get_lifetime(void) { const or_options_t *options = get_options(); -#define DFLT_GUARD_LIFETIME (86400 * 30) /* One month. */ -#define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define MIN_GUARD_LIFETIME (86400 * 30) /* One months. */ #define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */ if (options->GuardLifetime >= 1) {

1 0

[tor/maint-0.2.4] The *default* guard lifetime is two months; the *min* is one
by nickm＠torproject.org 21 Mar '13

21 Mar '13

commit 6196d0e83d78e2e8efff575d490f4cb254415832 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:22:59 2013 -0400 The *default* guard lifetime is two months; the *min* is one This caused an assertion failure when pruning guards. Fixes bug #8553; bug not in any released Tor. --- src/or/entrynodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 5bb0a73..6b21d10 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -459,8 +459,8 @@ static int32_t guards_get_lifetime(void) { const or_options_t *options = get_options(); -#define DFLT_GUARD_LIFETIME (86400 * 30) /* One month. */ -#define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define MIN_GUARD_LIFETIME (86400 * 30) /* One months. */ #define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */ if (options->GuardLifetime >= 1) {

1 0