- tor-commits - lists.torproject.org

[orbot/master] 15.1.0-RC-6
by n8fr8＠torproject.org 27 Jan '16

27 Jan '16

commit a8dbdacbcb2412bb08c4a665145371c3ac4abef1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 27 10:14:03 2016 -0500 15.1.0-RC-6 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index db30380..60867ab 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.0-RC-5" - android:versionCode="15100025" + android:versionName="15.1.0-RC-6" + android:versionCode="15100026" android:installLocation="auto" >

1 0

[orbot/master] update for RC-6...final?!
by n8fr8＠torproject.org 27 Jan '16

27 Jan '16

commit b76a2504bb5d725990364835486e2b09da0fc2c5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 27 10:15:24 2016 -0500 update for RC-6...final?! --- CHANGELOG | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f5a45a1..ef92ece 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,18 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.1.0-RC-6 / 27-January-2016 / a8dbdacbcb2412bb08c4a665145371c3ac4abef1 **/ + +Fixes to enable/attempt reproducible builds for this release +* 226d92e make-release-build: env vars need to be first on the command line +* 20c16ae ignore more files generated by the build +* 9883a89 faketime is only needed when building, not when cleaning +* eaa2dde explicitly indicate we are building armeabi +* 1b76c36 add make calls for both armeabi and x86 with clean +* 75eb36e remove lib binaries +* 3be93a0 only build for x86 and armeabi + +...and one small UI bug: +1839b8f add-in missing "break" for Meek Google /** 15.1.0-RC-5 / 26-January-2016 / 33fa19f9894c44879d81bc3fb578eb4e9b134b8f **/

1 0

[orbot/master] make-release-build: env vars need to be first on the command line
by n8fr8＠torproject.org 27 Jan '16

27 Jan '16

commit 226d92ebcd9bda9e5b9bacd40366354e4d28d610 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jan 27 09:41:53 2016 +0100 make-release-build: env vars need to be first on the command line --- make-release-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-release-build b/make-release-build index a8aa648..41166c4 100755 --- a/make-release-build +++ b/make-release-build @@ -71,9 +71,9 @@ faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build #clean, build, clean and build! make -C external clean -faketime "$TIMESTAMP" APP_ABI=armeabi make -C external +APP_ABI=armeabi faketime "$TIMESTAMP" make -C external make -C external clean -faketime "$TIMESTAMP" APP_ABI=x86 make -C external +APP_ABI=x86 faketime "$TIMESTAMP" make -C external ./setup-ant

1 0

[orbot/master] Merge pull request #27 from eighthave/master
by n8fr8＠torproject.org 27 Jan '16

27 Jan '16

commit eea9579ea3cae4f74d2352c257e8ec162bfd76f9 Merge: 1839b8f 226d92e Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 27 10:02:08 2016 -0500 Merge pull request #27 from eighthave/master make-release-build tweaks .gitignore | 6 ++++++ make-release-build | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

1 0

[orbot/master] add-in missing "break" for Meek Google
by n8fr8＠torproject.org 27 Jan '16

27 Jan '16

commit 1839b8f0b9fe048eb0aa7fca70db48474e3a8a4c Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Jan 26 18:31:04 2016 -0500 add-in missing "break" for Meek Google --- src/org/torproject/android/OrbotMainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 4165a21..e71d6c1 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -905,7 +905,7 @@ public class OrbotMainActivity extends AppCompatActivity case 5: //google Prefs.setBridgesList("0"); enableBridges(true); - + break; case 6: showGetBridgePrompt("obfs4");

1 0

[orbot/master] faketime is only needed when building, not when cleaning
by n8fr8＠torproject.org 27 Jan '16

27 Jan '16

commit 9883a8931a2a21d52a3a4794d727ff8782eb33c0 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jan 27 09:18:39 2016 +0100 faketime is only needed when building, not when cleaning cleaning while running faketime will just slow it down or cause weird behavior. --- make-release-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-release-build b/make-release-build index 6b54f74..a8aa648 100755 --- a/make-release-build +++ b/make-release-build @@ -70,9 +70,9 @@ fi faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build #clean, build, clean and build! -faketime "$TIMESTAMP" make -C external clean +make -C external clean faketime "$TIMESTAMP" APP_ABI=armeabi make -C external -faketime "$TIMESTAMP" make -C external clean +make -C external clean faketime "$TIMESTAMP" APP_ABI=x86 make -C external ./setup-ant

1 0

[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