January 2015 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 15 Jan '15

15 Jan '15

commit c52db85e095f52480e7a2993f710482a2bdc2a6d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 15 21:45:16 2015 +0000 Update translations for liveusb-creator --- ru/ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 5a87672..56a3222 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -12,6 +12,7 @@ # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 # Sergey Briskin <sergey.briskin(a)gmail.com>, 2014 # tavarysh <tavarysh(a)riseup.net>, 2013 +# Vladimir.Serykh <Vladimir.Serykh(a)extenza-studio.ru>, 2015 # vlasok <vlasok1987(a)yandex.ru>, 2012 # Yulia <ypoyarko(a)redhat.com>, 2009 msgid "" @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-13 18:07+0100\n" -"PO-Revision-Date: 2015-01-14 08:41+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-15 21:21+0000\n" +"Last-Translator: Vladimir.Serykh <Vladimir.Serykh(a)extenza-studio.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -391,7 +392,7 @@ msgstr "Попытка продолжить всё равно." #: ../liveusb/gui.py:407 msgid "USB drive found" -msgstr "" +msgstr "Найден USB-диск" #: ../liveusb/creator.py:954 #, python-format

1 0

[tor/maint-0.2.5] Fix a compilation warning in the unit tests
by nickm＠torproject.org 15 Jan '15

15 Jan '15

commit 2329d9fe3739aca46d00b47222db2f78bd23e4d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 15 12:56:57 2015 -0500 Fix a compilation warning in the unit tests --- src/test/test_relaycell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 5deb362..9aff6ab 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -104,7 +104,7 @@ test_relaycell_resolved(void *arg) tt_int_op(srm_answer_is_set, ==, 0); \ } \ tt_int_op(srm_ttl, ==, ttl); \ - tt_int_op(srm_expires, ==, expires); \ + tt_i64_op((int64_t)srm_expires, ==, (int64_t)expires); \ } while (0) (void)arg;

1 0

[tor/master] Ignore warning for redundant decl in openssl/srtp.h
by nickm＠torproject.org 15 Jan '15

15 Jan '15

commit 746bb55851433a0709e277ea3e1838d0d9b77d9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 16:06:25 2015 -0500 Ignore warning for redundant decl in openssl/srtp.h Backports some commits from tor master. --- changes/bug14220 | 4 ++++ src/common/tortls.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/changes/bug14220 b/changes/bug14220 new file mode 100644 index 0000000..51cfa50 --- /dev/null +++ b/changes/bug14220 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Build without warnings with the stock OpenSSL srtp.h header, + which has a duplicate declaration of SSL_get_selected_srtp_profile(). + Fixes bug 14220; this is OpenSSL's bug, not ours. diff --git a/src/common/tortls.c b/src/common/tortls.c index 999d971..d637a8e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -33,6 +33,20 @@ #include <ws2tcpip.h> #endif #endif + +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/ssl.h> #include <openssl/ssl3.h> #include <openssl/err.h> @@ -41,6 +55,14 @@ #include <openssl/bio.h> #include <openssl/opensslv.h> +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif +#endif + #ifdef USE_BUFFEREVENTS #include <event2/bufferevent_ssl.h> #include <event2/buffer.h>

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 15 Jan '15

15 Jan '15

commit d807c7c8725acb85a6695ab399f99c2509a245c4 Merge: 3368b0c 746bb55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 15 12:38:43 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14220 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/maint-0.2.5] Ignore warning for redundant decl in openssl/srtp.h
by nickm＠torproject.org 15 Jan '15

15 Jan '15

commit 746bb55851433a0709e277ea3e1838d0d9b77d9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 16:06:25 2015 -0500 Ignore warning for redundant decl in openssl/srtp.h Backports some commits from tor master. --- changes/bug14220 | 4 ++++ src/common/tortls.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/changes/bug14220 b/changes/bug14220 new file mode 100644 index 0000000..51cfa50 --- /dev/null +++ b/changes/bug14220 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Build without warnings with the stock OpenSSL srtp.h header, + which has a duplicate declaration of SSL_get_selected_srtp_profile(). + Fixes bug 14220; this is OpenSSL's bug, not ours. diff --git a/src/common/tortls.c b/src/common/tortls.c index 999d971..d637a8e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -33,6 +33,20 @@ #include <ws2tcpip.h> #endif #endif + +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/ssl.h> #include <openssl/ssl3.h> #include <openssl/err.h> @@ -41,6 +55,14 @@ #include <openssl/bio.h> #include <openssl/opensslv.h> +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif +#endif + #ifdef USE_BUFFEREVENTS #include <event2/bufferevent_ssl.h> #include <event2/buffer.h>

1 0

[tor/master] Add string for IP_NOW_REDUNDANT in circuit_end_reason_to_control_string
by nickm＠torproject.org 15 Jan '15

15 Jan '15

commit 3368b0c9f29bad67a85ec70cbcedb69cf85f103b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 15 11:53:20 2015 -0500 Add string for IP_NOW_REDUNDANT in circuit_end_reason_to_control_string Closes 14207; bugfix on 0.2.6.2-alpha. --- changes/bug14207 | 3 +++ src/or/reasons.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/changes/bug14207 b/changes/bug14207 new file mode 100644 index 0000000..987bb25 --- /dev/null +++ b/changes/bug14207 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - Add a code for the END_CIRC_REASON_IP_NOW_REDUNDANT circuit close + reason. Fixes bug 12407; bugfix on 0.2.6.2-alpha. diff --git a/src/or/reasons.c b/src/or/reasons.c index c65acb5..23ab604 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -350,6 +350,8 @@ circuit_end_reason_to_control_string(int reason) return "NOSUCHSERVICE"; case END_CIRC_REASON_MEASUREMENT_EXPIRED: return "MEASUREMENT_EXPIRED"; + case END_CIRC_REASON_IP_NOW_REDUNDANT: + return "IP_NOW_REDUNDANT"; default: if (is_remote) { /*

1 0

[tor/master] unittests: use tt_i64_op() instead of tt_int_op() in laplace tests.
by nickm＠torproject.org 15 Jan '15

15 Jan '15

commit bb56fd1f8f965f923529eede317a8964ee73a508 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jan 15 15:41:25 2015 +0000 unittests: use tt_i64_op() instead of tt_int_op() in laplace tests. Do this in even more places to try to fix the build. --- src/test/test_util.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 4039a09..2ee1d6d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4614,26 +4614,26 @@ test_util_round_to_next_multiple_of(void *arg) { (void)arg; - tt_int_op(round_uint64_to_next_multiple_of(0,1), ==, 0); - tt_int_op(round_uint64_to_next_multiple_of(0,7), ==, 0); + tt_u64_op(round_uint64_to_next_multiple_of(0,1), ==, 0); + tt_u64_op(round_uint64_to_next_multiple_of(0,7), ==, 0); - tt_int_op(round_uint64_to_next_multiple_of(99,1), ==, 99); - tt_int_op(round_uint64_to_next_multiple_of(99,7), ==, 105); - tt_int_op(round_uint64_to_next_multiple_of(99,9), ==, 99); + tt_u64_op(round_uint64_to_next_multiple_of(99,1), ==, 99); + tt_u64_op(round_uint64_to_next_multiple_of(99,7), ==, 105); + tt_u64_op(round_uint64_to_next_multiple_of(99,9), ==, 99); - tt_int_op(round_int64_to_next_multiple_of(0,1), ==, 0); - tt_int_op(round_int64_to_next_multiple_of(0,7), ==, 0); + tt_i64_op(round_int64_to_next_multiple_of(0,1), ==, 0); + tt_i64_op(round_int64_to_next_multiple_of(0,7), ==, 0); - tt_int_op(round_int64_to_next_multiple_of(99,1), ==, 99); - tt_int_op(round_int64_to_next_multiple_of(99,7), ==, 105); - tt_int_op(round_int64_to_next_multiple_of(99,9), ==, 99); + tt_i64_op(round_int64_to_next_multiple_of(99,1), ==, 99); + tt_i64_op(round_int64_to_next_multiple_of(99,7), ==, 105); + tt_i64_op(round_int64_to_next_multiple_of(99,9), ==, 99); - tt_int_op(round_int64_to_next_multiple_of(-99,1), ==, -99); - tt_int_op(round_int64_to_next_multiple_of(-99,7), ==, -98); - tt_int_op(round_int64_to_next_multiple_of(-99,9), ==, -99); + tt_i64_op(round_int64_to_next_multiple_of(-99,1), ==, -99); + tt_i64_op(round_int64_to_next_multiple_of(-99,7), ==, -98); + tt_i64_op(round_int64_to_next_multiple_of(-99,9), ==, -99); - tt_int_op(round_int64_to_next_multiple_of(INT64_MIN,2), ==, INT64_MIN); - tt_int_op(round_int64_to_next_multiple_of(INT64_MAX,2), ==, + tt_i64_op(round_int64_to_next_multiple_of(INT64_MIN,2), ==, INT64_MIN); + tt_i64_op(round_int64_to_next_multiple_of(INT64_MAX,2), ==, INT64_MAX-INT64_MAX%2); done: ;

1 0

[tor/master] fix typo
by arma＠torproject.org 15 Jan '15

15 Jan '15

commit 660a35d97c1bc600521a5ece373e70477176fb1c Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jan 15 11:03:13 2015 -0500 fix typo --- src/or/rendclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 75c7b9a..4b7d85a 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -1083,7 +1083,7 @@ rend_client_desc_trynow(const char *query) * the hidden service named <b>onion_address</b>. Called when a * connection attempt has ended; it is possible for this to be called * multiple times while handling an ended connection attempt, and - * any future changes to this functio n must ensure it remains + * any future changes to this function must ensure it remains * idempotent. */ void

1 0

[webwml/master] Bug 14123: Add the Tor Browser signing key
by sebastian＠torproject.org 15 Jan '15

15 Jan '15

commit af1c95ec9f6b2ebc3e7ba951d931a1c308e150a9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 15 15:35:07 2015 +0000 Bug 14123: Add the Tor Browser signing key --- docs/en/signing-keys.wml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index d114f61..b4341a5 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -23,9 +23,9 @@ packages for RPMs, Windows, and OS X.</li> <li>Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories and archives.</li> - <li>Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), - Nicolas Vigier (0xD0220E4B), and - Linus Nordberg (0x23291265) sign the Tor Browser releases.</li> + <li>Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), + Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265), and the + Tor Browser Developers (0x93298290) sign the Tor Browser releases.</li> <li>Damian Johnson (0x9ABBEEC6) signs Arm releases.</li> <li>Sebastian Hahn (0xC5AA446D), and David Fifield (0xC11F6276) sign Pluggable Transport Tor Browser Bundles. Sometimes Sebastian signs the Tor Browser Bundles.</li> <li>The Tails team (0xBE2CD9C1) signs the Tails live system @@ -184,6 +184,13 @@ uid Nicolas Vigier (TBB Builds Signing Key) <boklm@torpr uid Jacob Appelbaum <jacob(a)torproject.org> sub 3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27] sub 3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27] + + pub 4096R/0x4E2C6E8793298290 2014-12-15 + Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 + uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> + sub 4096R/0x2E1AC68ED40814E0 2014-12-15 + sub 4096R/0x7017ADCEF65C2036 2014-12-15 + sub 4096R/0x2D000988589839A3 2014-12-15 </pre> </div>

1 0

[webwml/staging] Bug 14123: Add the Tor Browser signing key
by sebastian＠torproject.org 15 Jan '15

15 Jan '15

commit af1c95ec9f6b2ebc3e7ba951d931a1c308e150a9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 15 15:35:07 2015 +0000 Bug 14123: Add the Tor Browser signing key --- docs/en/signing-keys.wml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index d114f61..b4341a5 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -23,9 +23,9 @@ packages for RPMs, Windows, and OS X.</li> <li>Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories and archives.</li> - <li>Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), - Nicolas Vigier (0xD0220E4B), and - Linus Nordberg (0x23291265) sign the Tor Browser releases.</li> + <li>Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), + Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265), and the + Tor Browser Developers (0x93298290) sign the Tor Browser releases.</li> <li>Damian Johnson (0x9ABBEEC6) signs Arm releases.</li> <li>Sebastian Hahn (0xC5AA446D), and David Fifield (0xC11F6276) sign Pluggable Transport Tor Browser Bundles. Sometimes Sebastian signs the Tor Browser Bundles.</li> <li>The Tails team (0xBE2CD9C1) signs the Tails live system @@ -184,6 +184,13 @@ uid Nicolas Vigier (TBB Builds Signing Key) <boklm@torpr uid Jacob Appelbaum <jacob(a)torproject.org> sub 3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27] sub 3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27] + + pub 4096R/0x4E2C6E8793298290 2014-12-15 + Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 + uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> + sub 4096R/0x2E1AC68ED40814E0 2014-12-15 + sub 4096R/0x7017ADCEF65C2036 2014-12-15 + sub 4096R/0x2D000988589839A3 2014-12-15 </pre> </div>

1 0