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

[orbot/master] ignore more files generated by the build
by n8fr8＠torproject.org 27 Jan '16

27 Jan '16

commit 20c16aec68fff1052a55272ecfc8d89c2f88da76 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jan 27 09:36:47 2016 +0100 ignore more files generated by the build --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 53cc940..0098ce3 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,12 @@ obj releases .transifexrc +# native build products +*.so +pdnsd +*.mp3 + # ant build products build.xml proguard-project.txt +ant.properties \ No newline at end of file

1 0

[tor/master] attempt to fix crashes in unit tests
by nickm＠torproject.org 27 Jan '16

27 Jan '16

commit 1a022525f7bac18b29e089a3e197ea4f0961a5d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 27 09:42:08 2016 -0500 attempt to fix crashes in unit tests --- src/test/test_options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index e00c802..4bae065 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -915,7 +915,7 @@ test_options_validate__authdir(void *ignored) done: teardown_capture_of_logs(previous_log); - sandbox_free_getaddrinfo_cache(); + // sandbox_free_getaddrinfo_cache(); free_options_test_data(tdata); tor_free(msg); } @@ -3088,7 +3088,7 @@ test_options_validate__proxy(void *ignored) free_options_test_data(tdata); memarea_clear_freelist(); policies_free_all(); - sandbox_free_getaddrinfo_cache(); + // sandbox_free_getaddrinfo_cache(); tor_free(msg); }

1 0

[webwml/master] Add new TBB version
by boklm＠torproject.org 27 Jan '16

27 Jan '16

commit bf4b4b2c9cdc5c15c5618df37106948e0c97c4c7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 27 15:11:18 2016 +0100 Add new TBB version --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index eaa37d6..755cd6f 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -19,10 +19,10 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>5.5</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a6</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a1</define-tag> <define-tag version-torbrowserbundle whitespace=delete>5.5</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a6</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a1</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -33,8 +33,8 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a6</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a6</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a1</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a1</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -42,7 +42,7 @@ <define-tag version-torbrowserbundleosx32 whitespace=delete>5.5</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>5.5</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a6</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a1</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 6e772d2..fd47feb 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -11,6 +11,10 @@ "5.5a6-Linux", "5.5a6-MacOS", "5.5a6-Windows", +"6.0a1", +"6.0a1-Linux", +"6.0a1-MacOS", +"6.0a1-Windows", "5.5a6-hardened", "5.5a6-hardened-Linux" ]

1 0

[tor/master] Correct further grammatical errors in tor comments
by nickm＠torproject.org 27 Jan '16

27 Jan '16

commit 39a86185c8c04c4622c5d1cd5f6cdcba91995473 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 27 08:51:28 2016 -0500 Correct further grammatical errors in tor comments Avoid using a pronoun where it makes comments unclear. Avoid using gender for things that don't have it. Avoid assigning gender to people unnecessarily. --- src/common/compat.c | 3 ++- src/or/connection.c | 4 ++-- src/or/connection_edge.c | 4 ++-- src/or/connection_or.c | 4 ++-- src/or/dirserv.c | 2 +- src/or/or.h | 2 +- src/or/policies.c | 2 +- src/test/test_dir.c | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index c1d4f89..fb22e92 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -717,7 +717,8 @@ strtok_helper(char *cp, const char *sep) } /** Implementation of strtok_r for platforms whose coders haven't figured out - * how to write one. Hey guys! You can use this code here for free! */ + * how to write one. Hey, retrograde libc developers! You can use this code + * here for free! */ char * tor_strtok_r_impl(char *str, const char *sep, char **lasts) { diff --git a/src/or/connection.c b/src/or/connection.c index efe804d..123c33a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3606,7 +3606,7 @@ connection_read_to_buf(connection_t *conn, ssize_t *max_to_read, } /* Call even if result is 0, since the global read bucket may - * have reached 0 on a different conn, and this guy needs to + * have reached 0 on a different conn, and this connection needs to * know to stop reading. */ connection_consider_empty_read_buckets(conn); if (n_written > 0 && connection_is_writing(conn)) @@ -4102,7 +4102,7 @@ connection_handle_write_impl(connection_t *conn, int force) } /* Call even if result is 0, since the global write bucket may - * have reached 0 on a different conn, and this guy needs to + * have reached 0 on a different conn, and this connection needs to * know to stop writing. */ connection_consider_empty_write_buckets(conn); if (n_read > 0 && connection_is_reading(conn)) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 758d583..dd81142 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2951,8 +2951,8 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) return 0; } /* Make sure to get the 'real' address of the previous hop: the - * caller might want to know whether his IP address has changed, and - * we might already have corrected base_.addr[ess] for the relay's + * caller might want to know whether the remote IP address has changed, + * and we might already have corrected base_.addr[ess] for the relay's * canonical IP address. */ if (or_circ && or_circ->p_chan) address = tor_strdup(channel_get_actual_remote_address(or_circ->p_chan)); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index d778eb3..29e8153 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1585,7 +1585,7 @@ connection_or_nonopen_was_started_here(or_connection_t *conn) * * If we initiated this connection (started_here is true), make sure * the other side sent a correctly formed certificate. If I initiated the - * connection, make sure it's the right guy. + * connection, make sure it's the right relay by checking the certificate. * * Otherwise (if we _didn't_ initiate this connection), it's okay for * the certificate to be weird or absent. @@ -1601,7 +1601,7 @@ connection_or_nonopen_was_started_here(or_connection_t *conn) * 1) Set conn->circ_id_type according to tor-spec.txt. * 2) If we're an authdirserver and we initiated the connection: drop all * descriptors that claim to be on that IP/port but that aren't - * this guy; and note that this guy is reachable. + * this relay; and note that this relay is reachable. * 3) If this is a bridge and we didn't configure its identity * fingerprint, remember the keyid we just learned. */ diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 620d324..491557e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3135,7 +3135,7 @@ dirserv_get_routerdescs(smartlist_t *descs_out, const char *key, * router listening at address:or_port, and has yielded * a certificate with digest digest_rcvd. * - * Inform the reachability checker that we could get to this guy. + * Inform the reachability checker that we could get to this relay. */ void dirserv_orconn_tls_done(const tor_addr_t *addr, diff --git a/src/or/or.h b/src/or/or.h index 103e76d..6faeb34 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1308,7 +1308,7 @@ typedef struct connection_t { * marked.) */ const char *marked_for_close_file; /**< For debugging: in which file were * we marked for close? */ - char *address; /**< FQDN (or IP) of the guy on the other end. + char *address; /**< FQDN (or IP) of the other end. * 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; diff --git a/src/or/policies.c b/src/or/policies.c index c9bce1b..4706a9d 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -2036,7 +2036,7 @@ compare_tor_addr_to_short_policy(const tor_addr_t *addr, uint16_t port, * allows exit enclaving. Trying it anyway would open up a cool attack * where the node refuses due to exitpolicy, the client reacts in * surprise by rewriting the node's exitpolicy to reject *:*, and then - * a bad guy targets users by causing them to attempt such connections + * an adversary targets users by causing them to attempt such connections * to 98% of the exits. * * Once microdescriptors can handle addresses in special cases (e.g. if diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 05fbe0a..4824a94 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3238,7 +3238,7 @@ test_dir_packages(void *arg) ADD(4, "clownshoes 22alpha4 http://quumble.example.cam/ blake2=fooa"); ADD(5, "clownshoes 22alpha4 http://quumble.example.cam/ blake2=fooa"); - /* Five votes for A ... all from the same guy. Three for B. */ + /* Five votes for A ... all from the same authority. Three for B. */ ADD(0, "cbc 99.1.11.1.1 http://example.com/cbc/ cubehash=ahooy sha512=m"); ADD(1, "cbc 99.1.11.1.1 http://example.com/cbc/ cubehash=ahooy sha512=m"); ADD(3, "cbc 99.1.11.1.1 http://example.com/cbc/ cubehash=ahooy sha512=m");

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Jan '16

27 Jan '16

commit 44c7953e3c5f5785dc08e3246756fc4669dfc202 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 27 13:45:26 2016 +0000 Update translations for https_everywhere_completed --- bg/https-everywhere.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd index b9a6e24..f6d401e 100644 --- a/bg/https-everywhere.dtd +++ b/bg/https-everywhere.dtd @@ -3,8 +3,11 @@ <!ENTITY https-everywhere.about.ext_description "Шифрирайте мрежата! Използвайте автоматична HTTPS защита на много страници."> <!ENTITY https-everywhere.about.version "Версия"> <!ENTITY https-everywhere.about.created_by "Създадено от"> +<!ENTITY https-everywhere.about.and "и"> <!ENTITY https-everywhere.about.librarians "Библиотеки с правила"> <!ENTITY https-everywhere.about.thanks "Благодарности на"> +<!ENTITY https-everywhere.about.many_contributors "Много сътрудници, включително"> +<!ENTITY https-everywhere.about.noscript "Също така, части от HTTPS Everywhere са базирани върху NoScript код, писан от Джорджо Маоне и други. Благодарни сме за отличната им работа!"> <!ENTITY https-everywhere.about.contribute "Ако харесвате HTTPS Everywhere можете да направите"> <!ENTITY https-everywhere.about.donate_tor "дарение за Tor"> <!ENTITY https-everywhere.about.tor_lang_code "bg">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '16

27 Jan '16

commit bf09bf35a9bb770de579fcb05b5012f9af35fe44 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 27 13:15:22 2016 +0000 Update translations for https_everywhere --- bg/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd index 0f58850..9f80f9a 100644 --- a/bg/https-everywhere.dtd +++ b/bg/https-everywhere.dtd @@ -3,10 +3,10 @@ <!ENTITY https-everywhere.about.ext_description "Шифрирайте мрежата! Използвайте автоматична HTTPS защита на много страници."> <!ENTITY https-everywhere.about.version "Версия"> <!ENTITY https-everywhere.about.created_by "Създадено от"> -<!ENTITY https-everywhere.about.and ", and"> +<!ENTITY https-everywhere.about.and "и"> <!ENTITY https-everywhere.about.librarians "Библиотеки с правила"> <!ENTITY https-everywhere.about.thanks "Благодарности на"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> +<!ENTITY https-everywhere.about.many_contributors "Много сътрудници, включително"> <!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> <!ENTITY https-everywhere.about.contribute "Ако харесвате HTTPS Everywhere можете да направите"> <!ENTITY https-everywhere.about.donate_tor "дарение за Tor">

1 0

[webwml/master] Adding ja to lang.wmi as well
by gk＠torproject.org 27 Jan '16

27 Jan '16

commit 6cbf967fb57aec1251ecbb0ab8f7bd46c23cac95 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 27 08:42:32 2016 +0000 Adding ja to lang.wmi as well --- include/lang.wmi | 1 + 1 file changed, 1 insertion(+) diff --git a/include/lang.wmi b/include/lang.wmi index c43acd5..2f5e794 100644 --- a/include/lang.wmi +++ b/include/lang.wmi @@ -12,6 +12,7 @@ <option value="fa">فارسی</option> <option value="fr">Français</option> <option value="it">Italiano</option> + <option value="ja">日本語</option> <option value="ko">Korean</option> <option value="nl">Nederlands</option> <option value="pl">Polish</option>

1 0

[webwml/master] Add ja locale for stable series
by gk＠torproject.org 27 Jan '16

27 Jan '16

commit 3b44351abe7871821664370a1a97656cf09fe166 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 27 08:36:22 2016 +0000 Add ja locale for stable series --- projects/en/torbrowser.wml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index e567eac..f7811dc 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -181,6 +181,19 @@ • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.xz">64-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.xz.asc">sig</a>)</td> </tr> + <tr> + <td>日本語 (ja)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ja.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ja.exe.asc">sig</a>)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_ja.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_ja.dmg.asc">sig</a>) +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ja.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ja.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ja.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ja.tar.xz.asc">sig</a>)</td> + </tr> <tr class="alt"> <td>Korean (ko)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ko.exe">32/64-bit</a>

1 0

[webwml/master] Add new Tor Browser version
by gk＠torproject.org 27 Jan '16

27 Jan '16

commit 853cb0d165fecc612493d57b179c915149bc0938 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 27 07:38:40 2016 +0000 Add new Tor Browser version --- include/versions.wmi | 12 ++++++------ projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index b7a21f6..eaa37d6 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.5</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a6</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.5</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>5.5a6</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -31,8 +31,8 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.7</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a6</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a6</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -40,8 +40,8 @@ <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.7</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a6</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index eeaabe7..6e772d2 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "5.0.7-Linux", "5.0.7-MacOS", "5.0.7-Windows", +"5.5", +"5.5-Linux", +"5.5-MacOS", +"5.5-Windows", "5.5a6", "5.5a6-Linux", "5.5a6-MacOS",

1 0

[orbot/master] only build for x86 and armeabi
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 3be93a0eaf0eb67da8e20edb3abfb440fd6f0732 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Jan 26 18:20:45 2016 -0500 only build for x86 and armeabi --- jni/Application.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/Application.mk b/jni/Application.mk index 7d4d00d..554a462 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := armeabi armeabi-v7a arm64-v8a mips x86 +APP_ABI := armeabi x86 APP_PLATFORM := android-16 APP_STL := stlport_static NDK_TOOLCHAIN_VERSION := 4.8

1 0