June 2016 - tor-commits - lists.torproject.org

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 06 Jun '16

06 Jun '16

commit 31ff6f384246ce29faf2ed54fe5f5521a97c178a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 6 15:15:39 2016 +0000 Update translations for mat-gui_completed --- lb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lb.po b/lb.po index f9455ef..d5fcb16 100644 --- a/lb.po +++ b/lb.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-03 20:54+0100\n" -"PO-Revision-Date: 2016-01-06 22:43+0000\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-06-06 15:04+0000\n" "Last-Translator: Tyler Durden <virii(a)enn.lu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n" "MIME-Version: 1.0\n" @@ -73,12 +73,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "Gréisst a Qualitéit vun der erstallter PDF reduzéieren" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "Net Ënnerstëtzten Dateien an d'Archiv leeën?" +msgid "Remove unsupported file from archives" +msgstr "Net ënnerstëtzten Dateien aus den Archiver läschen" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Net Ënnerstëtzten (an domadder och net anonymiséiert) Dateien an d'Ausgab Archiv leeën" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Net ënnerstëtzten (an domadder och net anonymiséiert) Dateien aus dem Ausgangsarchiv läschen" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 06 Jun '16

06 Jun '16

commit 09e6b89c78385f413811fdb74febc39c57a7c271 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 6 15:15:32 2016 +0000 Update translations for mat-gui --- lb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lb.po b/lb.po index 672c301..d5fcb16 100644 --- a/lb.po +++ b/lb.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-06-06 15:04+0000\n" +"Last-Translator: Tyler Durden <virii(a)enn.lu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,11 +74,11 @@ msgstr "Gréisst a Qualitéit vun der erstallter PDF reduzéieren" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Net ënnerstëtzten Dateien aus den Archiver läschen" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Net ënnerstëtzten (an domadder och net anonymiséiert) Dateien aus dem Ausgangsarchiv läschen" #: mat-gui:280 msgid "Unknown"

1 0

[tor/master] Repair test_crypto_openssl_version with LibreSSL
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit 1e330e1947b750be12b217c944534f9284509751 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 6 10:45:23 2016 -0400 Repair test_crypto_openssl_version with LibreSSL --- src/test/test_crypto.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index d3e12b6..0e82223 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -156,12 +156,13 @@ test_crypto_openssl_version(void *arg) (void)arg; const char *version = crypto_openssl_get_version_str(); const char *h_version = crypto_openssl_get_header_version_str(); - tt_assert(version); tt_assert(h_version); tt_assert(!strcmpstart(version, h_version)); /* "-fips" suffix, etc */ tt_assert(!strstr(version, "OpenSSL")); int a=-1,b=-1,c=-1; + if (!strcmpstart(version, "LibreSSL") || !strcmpstart(version, "BoringSSL")) + return; int r = tor_sscanf(version, "%d.%d.%d", &a,&b,&c); tt_int_op(r, OP_EQ, 3); tt_int_op(a, OP_GE, 0);

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit c19a3d1bf893b19d73b3a9038162c403817034ac Merge: 83513a9 6eeedc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 6 10:18:07 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19191 | 5 +++++ src/or/routerlist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Use tor_sscanf, not sscanf, in test_util.c.
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit 5854b19816bc7b09df4785afbfb0e8891b398638 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 10:11:29 2016 -0400 Use tor_sscanf, not sscanf, in test_util.c. Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from working. --- changes/bug19213 | 3 +++ src/test/test_util.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug19213 b/changes/bug19213 new file mode 100644 index 0000000..f912ffb --- /dev/null +++ b/changes/bug19213 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Cause the unit tests to compile correctly on mingw64 versions + that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 0a5783e..046e92e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4377,7 +4377,7 @@ test_util_writepid(void *arg) contents = read_file_to_str(fname, 0, NULL); tt_assert(contents); - int n = sscanf(contents, "%lu\n%c", &pid, &c); + int n = tor_sscanf(contents, "%lu\n%c", &pid, &c); tt_int_op(n, OP_EQ, 1); #ifdef _WIN32

1 0

[tor/master] Use directory_must_use_begindir to predict we'll surely use begindir
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit 6eeedc02d8aee0bf1eda8e592764ec9c5df4add7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 10:40:39 2016 -0400 Use directory_must_use_begindir to predict we'll surely use begindir Previously, we used !directory_fetches_from_authorities() to predict that we would tunnel connections. But the rules have changed somewhat over the course of 0.2.8 --- changes/bug19191 | 5 +++++ src/or/routerlist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19191 b/changes/bug19191 new file mode 100644 index 0000000..8670aaa --- /dev/null +++ b/changes/bug19191 @@ -0,0 +1,5 @@ + o Minor bugfixes (downloading): + - Predict more correctly whether we'll be downloading over HTTP when we + determine the maximum length of a URL. This should avoid a "BUG" + warning about the Squid HTTP proxy and its URL limits. Fixes bug 19191; + bugfix on ?????. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a08b5f3..82376c0 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4674,7 +4674,7 @@ max_dl_per_request(const or_options_t *options, int purpose) } /* If we're going to tunnel our connections, we can ask for a lot more * in a request. */ - if (!directory_fetches_from_authorities(options)) { + if (directory_must_use_begindir(options)) { max = 500; } return max;

1 0

[tor/release-0.2.8] Use directory_must_use_begindir to predict we'll surely use begindir
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit 6eeedc02d8aee0bf1eda8e592764ec9c5df4add7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 10:40:39 2016 -0400 Use directory_must_use_begindir to predict we'll surely use begindir Previously, we used !directory_fetches_from_authorities() to predict that we would tunnel connections. But the rules have changed somewhat over the course of 0.2.8 --- changes/bug19191 | 5 +++++ src/or/routerlist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19191 b/changes/bug19191 new file mode 100644 index 0000000..8670aaa --- /dev/null +++ b/changes/bug19191 @@ -0,0 +1,5 @@ + o Minor bugfixes (downloading): + - Predict more correctly whether we'll be downloading over HTTP when we + determine the maximum length of a URL. This should avoid a "BUG" + warning about the Squid HTTP proxy and its URL limits. Fixes bug 19191; + bugfix on ?????. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a08b5f3..82376c0 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4674,7 +4674,7 @@ max_dl_per_request(const or_options_t *options, int purpose) } /* If we're going to tunnel our connections, we can ask for a lot more * in a request. */ - if (!directory_fetches_from_authorities(options)) { + if (directory_must_use_begindir(options)) { max = 500; } return max;

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit a32ca313c4bc67d56af5f345fa0129b50c006b12 Merge: f258064 5854b19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 10:12:56 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug19213 | 3 +++ src/test/test_util.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit 399eebea5480f9515e8a9cd204cd8c5b0dc544db Merge: dc624a7 6eeedc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 6 10:17:57 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug19191 | 5 +++++ changes/bug19213 | 3 +++ src/or/routerlist.c | 2 +- src/test/test_util.c | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.8] Use directory_must_use_begindir to predict we'll surely use begindir
by nickm＠torproject.org 06 Jun '16

06 Jun '16

commit 6eeedc02d8aee0bf1eda8e592764ec9c5df4add7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 10:40:39 2016 -0400 Use directory_must_use_begindir to predict we'll surely use begindir Previously, we used !directory_fetches_from_authorities() to predict that we would tunnel connections. But the rules have changed somewhat over the course of 0.2.8 --- changes/bug19191 | 5 +++++ src/or/routerlist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19191 b/changes/bug19191 new file mode 100644 index 0000000..8670aaa --- /dev/null +++ b/changes/bug19191 @@ -0,0 +1,5 @@ + o Minor bugfixes (downloading): + - Predict more correctly whether we'll be downloading over HTTP when we + determine the maximum length of a URL. This should avoid a "BUG" + warning about the Squid HTTP proxy and its URL limits. Fixes bug 19191; + bugfix on ?????. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a08b5f3..82376c0 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4674,7 +4674,7 @@ max_dl_per_request(const or_options_t *options, int purpose) } /* If we're going to tunnel our connections, we can ask for a lot more * in a request. */ - if (!directory_fetches_from_authorities(options)) { + if (directory_must_use_begindir(options)) { max = 500; } return max;

1 0