- tor-commits - lists.torproject.org

[tor/maint-0.2.8] Only define NEW_THREAD_API when not building with LibreSSL.
by nickm＠torproject.org 05 Apr '16

05 Apr '16

commit 967491f1566002861b4ff64cfcd68052acb35900 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 10:38:15 2016 -0400 Only define NEW_THREAD_API when not building with LibreSSL. --- src/common/crypto.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2da5791..d2a4269 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -72,11 +72,12 @@ #define DISABLE_ENGINES #endif -#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,4) +#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,4) && \ + !defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL as of 1.1.0-pre4 has an "new" thread API, which doesn't require * seting up various callbacks. * - * Note: Yes, using OPENSSL_VER is naughty, but theis was introduced in the + * Note: Yes, using OPENSSL_VER is naughty, but this was introduced in the * pre-release series. */ #define NEW_THREAD_API

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 05 Apr '16

05 Apr '16

commit 941c15d3bd7ece007e20257c18d36776fe110593 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 5 14:16:55 2016 +0000 Update translations for tails-onioncircuits --- nn/onioncircuits.pot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nn/onioncircuits.pot b/nn/onioncircuits.pot index 9f24654..4feb119 100644 --- a/nn/onioncircuits.pot +++ b/nn/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 03:31+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-05 14:11+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: ../onioncircuits:81 msgid "" "Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "KLarte ikkje å kopla til Tor daemon. Onion Circuits vil freista å kopla til " #: ../onioncircuits:94 msgid "Onion Circuits"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 05 Apr '16

05 Apr '16

commit ffe4b9a3597b0c4dde90f355afb6a37188e05504 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 5 14:16:00 2016 +0000 Update translations for tails-iuk --- nn.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nn.po b/nn.po index 292da4e..bf8d557 100644 --- a/nn.po +++ b/nn.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-03-07 17:51+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-04-05 14:10+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +23,7 @@ msgstr "" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "" +msgstr "For feilskingsinformasjonn, utfør følgjande kommando: sudo tails-debugging-info" #: ../lib/Tails/IUK/Frontend.pm:215 msgid "Error while checking for upgrades"

1 0

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

05 Apr '16

commit a9dde7dcb5fa6b8af395f9e95119bb5682c5c4f8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 5 14:15:36 2016 +0000 Update translations for mat-gui_completed --- nn.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nn.po b/nn.po index 7baae1c..b1028b8 100644 --- a/nn.po +++ b/nn.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 # Øystein Alværvik <oystein.alver(a)gmail.com>, 2016 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-26 19:46+0000\n" -"Last-Translator: Øystein Alværvik <oystein.alver(a)gmail.com>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-04-05 14:09+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,12 +74,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "Reduser storleik til produsert PDF og kvalitet" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "Legg til ustøtta filer i arkiva" +msgid "Remove unsupported file from archives" +msgstr "Fjern ikkje-støtta filer frå arkivet" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Legg til ikkje-støtta (og med det ikkje-anonymiserte) filer i utdata-arkivet" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Fjern ikkje-støtta (og so ikkje-anonymiserte) filer frå utgåande arkiv." #: mat-gui:280 msgid "Unknown"

1 0

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

05 Apr '16

commit ee2b2552041164abe92231b8ca9630a7f11ca323 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 5 14:15:33 2016 +0000 Update translations for mat-gui --- nn.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nn.po b/nn.po index 68d51aa..b1028b8 100644 --- a/nn.po +++ b/nn.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 # Øystein Alværvik <oystein.alver(a)gmail.com>, 2016 msgid "" 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-04-05 14:09+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,11 @@ msgstr "Reduser storleik til produsert PDF og kvalitet" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Fjern ikkje-støtta filer frå arkivet" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Fjern ikkje-støtta (og so ikkje-anonymiserte) filer frå utgåande arkiv." #: mat-gui:280 msgid "Unknown"

1 0

[tor/master] Fix a comment typo in compat.h
by nickm＠torproject.org 05 Apr '16

05 Apr '16

commit 6a2b4db4f9bc1503788e470bdf67e770fbc2cc81 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Apr 5 13:45:37 2016 +1000 Fix a comment typo in compat.h --- src/common/compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.h b/src/common/compat.h index 8cf8458..b6ee410 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -430,7 +430,7 @@ typedef int socklen_t; #ifdef _WIN32 /* XXX Actually, this should arguably be SOCKET; we use intptr_t here so that - * any inadvertant checks for the socket being <= 0 or > 0 will probably + * any inadvertent checks for the socket being <= 0 or > 0 will probably * still work. */ #define tor_socket_t intptr_t #define TOR_SOCKET_T_FORMAT INTPTR_T_FORMAT

1 0

[tor/master] Clarify comments on connection_t's address fields
by nickm＠torproject.org 05 Apr '16

05 Apr '16

commit 5d2b1c784bd1b53a61d7893c64d41a17c4997c05 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Apr 5 13:45:09 2016 +1000 Clarify comments on connection_t's address fields --- src/or/or.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 111d098..905c49f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1294,21 +1294,26 @@ typedef struct connection_t { time_t timestamp_created; /**< When was this connection_t created? */ - /* XXXX_IP6 make this IPv6-capable */ int socket_family; /**< Address family of this connection's socket. Usually - * AF_INET, but it can also be AF_UNIX, or in the future - * AF_INET6 */ - tor_addr_t addr; /**< IP of the other side of the connection; used to - * identify routers, along with port. */ - uint16_t port; /**< If non-zero, port on the other end - * of the connection. */ + * AF_INET, but it can also be AF_UNIX, or AF_INET6 */ + tor_addr_t addr; /**< IP that socket "s" is directly connected to; + * may be the IP address for a proxy or pluggable transport, + * see "address" for the address of the final destination. + */ + uint16_t port; /**< If non-zero, port that socket "s" is directly connected + * to; may be the port for a proxy or pluggable transport, + * see "address" for the port at the final destination. */ uint16_t marked_for_close; /**< Should we close this conn on the next * iteration of the main loop? (If true, holds * the line number where this connection was * marked.) */ const char *marked_for_close_file; /**< For debugging: in which file were * we marked for close? */ - char *address; /**< FQDN (or IP) of the other end. + char *address; /**< FQDN (or IP) and port of the final destination for this + * connection; this is always the remote address, it is + * passed to a proxy or pluggable transport if one in use. + * See "addr" and "port" for the address that socket "s" is + * directly connected to. * strdup into this, because free_connection() frees it. */ /** Another connection that's connected to this one in lieu of a socket. */ struct connection_t *linked_conn;

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18720'
by nickm＠torproject.org 05 Apr '16

05 Apr '16

commit 16f7851807995fd2b42f15b1303c8431d0f7ba38 Merge: 6720628 6a2b4db Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 10:08:11 2016 -0400 Merge remote-tracking branch 'teor/bug18720' src/common/compat.h | 2 +- src/or/or.h | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.8] Add a changes file for the OpenSSL 1.1.0 compilation fixes.
by nickm＠torproject.org 05 Apr '16

05 Apr '16

commit 92ae6b95243054644dd8515a9cfa11679440a579 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Apr 4 04:21:06 2016 +0000 Add a changes file for the OpenSSL 1.1.0 compilation fixes. --- changes/bug18286 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug18286 b/changes/bug18286 new file mode 100644 index 0000000..6e9ae3d --- /dev/null +++ b/changes/bug18286 @@ -0,0 +1,4 @@ + o Minor features (build): + - Tor now again builds with the recent OpenSSL 1.1 development branch + (tested against 1.1.0-pre4 and 1.1.0-pre5-dev). +

1 0

[tor/maint-0.2.8] OpenSSL 1.1.0-pre5-dev and later made BIO opaque.
by nickm＠torproject.org 05 Apr '16

05 Apr '16

commit 5db21f8f81b5b42fcd072cfa06e6fa80a5e64aed Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Apr 4 04:08:54 2016 +0000 OpenSSL 1.1.0-pre5-dev and later made BIO opaque. Detect newer versions and fix our TLS code to use the new API. --- src/common/tortls.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/common/tortls.c b/src/common/tortls.c index fe21875..4ffc672 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2274,8 +2274,18 @@ tor_tls_get_n_raw_bytes(tor_tls_t *tls, size_t *n_read, size_t *n_written) * save the original BIO for tls->ssl in the tor_tls_t structure, but * that would be tempting fate. */ wbio = SSL_get_wbio(tls->ssl); +#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) + /* BIO structure is opaque as of OpenSSL 1.1.0-pre5-dev. Again, not + * supposed to use this form of the version macro, but the OpenSSL developers + * introduced major API changes in the pre-release stage. + */ + if (BIO_method_type(wbio) == BIO_TYPE_BUFFER && + (tmpbio = BIO_next(wbio)) != NULL) + wbio = tmpbio; +#else if (wbio->method == BIO_f_buffer() && (tmpbio = BIO_next(wbio)) != NULL) wbio = tmpbio; +#endif w = BIO_number_written(wbio); /* We are ok with letting these unsigned ints go "negative" here:

1 0