September 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit ff0aabc35d3688410846d7fee1a0dc9220b189ef Merge: 427ae164f 1a26c6be8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:45:07 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23568 | 4 ++++ src/common/compress_zstd.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --cc src/common/compress_zstd.c index 58ec28d00,63e92ed22..c1cdaf17a --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@@ -62,15 -62,15 +62,15 @@@ tor_zstd_get_version_str(void version_number = ZSTD_versionNumber(); tor_snprintf(version_str, sizeof(version_str), - "%lu.%lu.%lu", - version_number / 10000 % 100, - version_number / 100 % 100, - version_number % 100); + "%d.%d.%d", + (int) version_number / 10000 % 100, + (int) version_number / 100 % 100, + (int) version_number % 100); return version_str; -#else +#else /* !(defined(HAVE_ZSTD)) */ return NULL; -#endif +#endif /* defined(HAVE_ZSTD) */ } /** Return a string representation of the version of the version of libzstd

1 0

[tor/master] changes file for bug23568
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 1a26c6be8b013822eccaa2feece24954f60185bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:45:03 2017 -0400 changes file for bug23568 --- changes/bug23568 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug23568 b/changes/bug23568 new file mode 100644 index 000000000..cac465568 --- /dev/null +++ b/changes/bug23568 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning when building with zstd support + on 32-bit platforms. Fixes bug 23568; bugfix on 0.3.1.1-alpha. + Found and fixed by Andreas Stieger.

1 0

[tor/maint-0.3.1] changes file for bug23568
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 1a26c6be8b013822eccaa2feece24954f60185bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:45:03 2017 -0400 changes file for bug23568 --- changes/bug23568 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug23568 b/changes/bug23568 new file mode 100644 index 000000000..cac465568 --- /dev/null +++ b/changes/bug23568 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning when building with zstd support + on 32-bit platforms. Fixes bug 23568; bugfix on 0.3.1.1-alpha. + Found and fixed by Andreas Stieger.

1 0

[tor/maint-0.3.1] in zstd compression, fix 32 bit build
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 427c2cc9e8f640769a7f8771c42b89948e78028e Author: Andreas Stieger <astieger(a)suse.com> Date: Mon Sep 18 21:15:52 2017 +0200 in zstd compression, fix 32 bit build format '%lu' expects argument of type 'long unsigned int', but argument ... has type 'size_t' Closes ticket 23568. --- src/common/compress_zstd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 0808bcd9a..63e92ed22 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -62,10 +62,10 @@ tor_zstd_get_version_str(void) version_number = ZSTD_versionNumber(); tor_snprintf(version_str, sizeof(version_str), - "%lu.%lu.%lu", - version_number / 10000 % 100, - version_number / 100 % 100, - version_number % 100); + "%d.%d.%d", + (int) version_number / 10000 % 100, + (int) version_number / 100 % 100, + (int) version_number % 100); return version_str; #else

1 0

[tor/release-0.3.1] in zstd compression, fix 32 bit build
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 427c2cc9e8f640769a7f8771c42b89948e78028e Author: Andreas Stieger <astieger(a)suse.com> Date: Mon Sep 18 21:15:52 2017 +0200 in zstd compression, fix 32 bit build format '%lu' expects argument of type 'long unsigned int', but argument ... has type 'size_t' Closes ticket 23568. --- src/common/compress_zstd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 0808bcd9a..63e92ed22 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -62,10 +62,10 @@ tor_zstd_get_version_str(void) version_number = ZSTD_versionNumber(); tor_snprintf(version_str, sizeof(version_str), - "%lu.%lu.%lu", - version_number / 10000 % 100, - version_number / 100 % 100, - version_number % 100); + "%d.%d.%d", + (int) version_number / 10000 % 100, + (int) version_number / 100 % 100, + (int) version_number % 100); return version_str; #else

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 7ef22d0bf04f1b703e8d01b7d172bc0b82e0257d Merge: 61d0f65cf 1a26c6be8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:45:07 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23568 | 4 ++++ src/common/compress_zstd.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.1] changes file for bug23568
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 1a26c6be8b013822eccaa2feece24954f60185bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:45:03 2017 -0400 changes file for bug23568 --- changes/bug23568 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug23568 b/changes/bug23568 new file mode 100644 index 000000000..cac465568 --- /dev/null +++ b/changes/bug23568 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning when building with zstd support + on 32-bit platforms. Fixes bug 23568; bugfix on 0.3.1.1-alpha. + Found and fixed by Andreas Stieger.

1 0

[tor/master] Fix a comment that misunderstood is_canonical
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 427ae164f33aad6004290fc407d53ab3315b399a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:38:50 2017 -0400 Fix a comment that misunderstood is_canonical is_canonical doesn't mean "am I connected to the one true address of this relay"; it means "does this relay tell me that the address I'm connected to belong to it." The point is to prevent TCP-based MITM, not to prevent the relay from multi-homing. Related to 22890. --- src/or/channeltls.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 7f6882448..827781318 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1793,12 +1793,11 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) return; } /* A relay can connect from anywhere and be canonical, so - * long as it tells you from where it came. This may be a bit - * concerning.. Luckily we have another check in - * channel_tls_matches_target_method() to ensure that extends - * only go to the IP they ask for. - * - * XXX: Bleh. That check is not used if the connection is canonical. + * long as it tells you from where it came. This may sound a bit + * concerning... but that's what "canonical" means: that the + * address is one that the relay itself has claimed. The relay + * might be doing something funny, but nobody else is doing a MITM + * on the relay's TCP. */ if (tor_addr_eq(&addr, &(chan->conn->real_addr))) { connection_or_set_canonical(chan->conn, 1);

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.6
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 9531065790b09471d9deb66dad59fcc44bdd6db3 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 20 13:18:52 2017 +0000 Release preparations for 7.0.6 Changelog update, versions bump, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ gitian/versions | 14 +++++++------- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index aace374..310cdf0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser 7.0.6 -- September 26 2017 + * All Platforms + * Update Firefox to 52.4.0esr + * Update Tor to 0.3.1.7 + * Update Torbutton to 1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + * Update HTTPS-Everywhere to 2017.9.12 + * Update NoScript to 5.0.10 + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 23393: Don't crash all tabs when closing one tab + * OS X + * Bug 23404: Add missing Noto Sans Buginese font to the macOS whitelist + Tor Browser 7.0.5 -- September 4 2017 * All Platforms * Update Torbutton to 1.9.7.6 diff --git a/gitian/versions b/gitian/versions index d6e1dd4..368fb98 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.3.0esr +FIREFOX_VERSION=52.4.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.0.10 +TOR_TAG=tor-0.3.1.7 TORLAUNCHER_TAG=0.2.12.3 -TORBUTTON_TAG=1.9.7.6 -HTTPSE_TAG=2017.8.31 +TORBUTTON_TAG=1.9.7.7 +HTTPSE_TAG=2017.9.12 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.0.9-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.10-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=610dc5ffcc7133f2ccc2f1a14280e326d371a8a2fc76497becf2d5cf21257955 +NOSCRIPT_HASH=cfc8018a5ddd2a699581932a9911e28b1060667c7849cf5283b548b5b29a65a2 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index dbd4551..9838c8a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.5 + release: 7.0.6 versions: - 7.0.5: - platformVersion: 52.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-705-released + 7.0.6: + platformVersion: 52.4.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-706-released incremental_from: - - 7.0.4 + - 7.0.5 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torspec/master] Remove a comment about unimplemented feature in 0.2.0.23-rc
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 7842a0621b90e61b45be34619dd3de5bca4bcbd6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:38:42 2017 -0400 Remove a comment about unimplemented feature in 0.2.0.23-rc --- tor-spec.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 291c964..4dc1ab4 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1158,8 +1158,6 @@ see tor-design.pdf. - The OR knows that the IP of the connection it's using is canonical because it was listed in the server descriptor. - [This is not implemented in Tor 0.2.0.23-rc.] - 5.4. Tearing down circuits Circuits are torn down when an unrecoverable error occurs along

1 0