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

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

05 Sep '17

commit e58f11077e7c9f74708c65f1f59b8912e9a8e0b8 Merge: 56df12393 2d55620a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 08:31:20 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump

1 0

[tor/master] Bump version to 0.3.1.6-rc
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 2d55620a9eac89cd1dd43250899119485b505a15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 08:30:52 2017 -0400 Bump version to 0.3.1.6-rc --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a7cf8f739..33f74da55 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.5-alpha-dev]) +AC_INIT([tor],[0.3.1.6-rc]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 45b2db816..d35b5c682 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.1.5-alpha-dev" +!define VERSION "0.3.1.6-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index fc52ca3a1..1f6373e00 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.5-alpha-dev" +#define VERSION "0.3.1.6-rc"

1 0

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

05 Sep '17

commit b9c29105f1f8c6a5a50212b84e8dd06b7e9e4ff8 Merge: bebf7eb54 2d55620a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 08:31:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] hs: Don't enter the HS v3 subsystem without a live consensus
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 9e900d1db7c8c9e164b5b14d5cdd4099c1ce45f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 25 14:03:15 2017 -0400 hs: Don't enter the HS v3 subsystem without a live consensus The service needs the latest SRV and set of relays for the best accurate hashring to upload its descriptor to so it needs a live consensus thus don't do anything until we have it. Fixes #23331 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 5d51d1dea..d57ef521c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2110,7 +2110,8 @@ hs_service_callback(time_t now, const or_options_t *options) /* We need to at least be able to build circuits and that we actually have * a working network. */ - if (!have_completed_a_circuit() || net_is_disabled()) { + if (!have_completed_a_circuit() || net_is_disabled() || + networkstatus_get_live_consensus(now) == NULL) { goto end; }

1 0

[tor/master] Merge branch 'bug23331_032_01_squashed'
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 56df12393304469e18e8417ae0781c164090522a Merge: 42394053c 9e900d1db Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 08:24:28 2017 -0400 Merge branch 'bug23331_032_01_squashed' src/or/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[metrics-lib/master] Update to latest metrics-base.
by karsten＠torproject.org 05 Sep '17

05 Sep '17

commit 13a22d9ebef304a37179f65f0f00e3c71c3e2523 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 5 14:03:51 2017 +0200 Update to latest metrics-base. But override the switch from Java 7 to 8 until all metrics libraries depending on metrics-lib have upgraded to Java 8 first. --- build.xml | 1 + src/build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 832f29a..3d712a1 100644 --- a/build.xml +++ b/build.xml @@ -12,6 +12,7 @@ <property name="implementation-title" value="Tor Metrics Library" /> <property name="name" value="metrics-lib" /> <property name="jarpatternprop" value="empty" /> + <property name="source-and-target-java-version" value="1.7" /> <patternset id="runtime" > <include name="commons-compress-1.13.jar"/> diff --git a/src/build b/src/build index b491c84..a64b94a 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit b491c845ab81027d2f29fe541f8303ff151d3d0b +Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24

1 0

[tor-browser-bundle/master] Bug 23213: Deprecate gitian/tor-browser-bundle development
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit b273e8a38b24e716008fa9f51a2b53f20c1f1255 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 09:21:00 2017 +0000 Bug 23213: Deprecate gitian/tor-browser-bundle development --- README | 13 +++++++++++++ gitian/README.build | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/README b/README index 2ac74a5..fbc53ba 100644 --- a/README +++ b/README @@ -1,3 +1,16 @@ +A DEVELOPMENT NOTE: +=================== + +Developing the reproducible builds environment for Tor Browser with +gitian/tor-browser-bundle is deprecated. Recently, we switched to +rbm/tor-browser-build. See: +https://trac.torproject.org/projects/tor/ticket/23213. To get started with the +new system, check out +https://git.torproject.org/builders/tor-browser-build.git and follow the +instructions in the README file. + +------------------- + There are currently two ways to use the Tor Browser Bundle builder. If you are already on an Ubuntu 12.04+ machine or VM, please see diff --git a/gitian/README.build b/gitian/README.build index 4d01d6a..a962fca 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,3 +1,16 @@ +A DEVELOPMENT NOTE: +=================== + +Developing the reproducible builds environment for Tor Browser with +gitian/tor-browser-bundle is deprecated. Recently, we switched to +rbm/tor-browser-build. See: +https://trac.torproject.org/projects/tor/ticket/23213. To get started with the +new system, check out +https://git.torproject.org/builders/tor-browser-build.git and follow the +instructions in the README file. + +------------------- + QuickStart: On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run:

1 0

[tor-browser-build/master] Bug 23408: Don't include 'ALL' in nightly filenames
by boklm＠torproject.org 05 Sep '17

05 Sep '17

commit 28752f60a2c5d197c5cd6478e7d9918b7bc4a695 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 08:58:49 2017 +0000 Bug 23408: Don't include 'ALL' in nightly filenames In test builds only the en-US locale is provided, this 'ALL' in the filename is confusing. And the nightlies are not being built multi- lingual for a while now in tor-browser-bundle --- rbm.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 44fc9f5..10a60f8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -112,7 +112,6 @@ targets: nightly: var: nightly: 1 - multi_lingual: 1 torbrowser-testbuild: - testbuild

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit ddd7f3b9b5d8ea75aacffee63d21c50faae073c2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 08:18:49 2017 +0000 Fold in stable changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 16c10f5..8945e0c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 7.0.5 -- September 4 2017 + * All Platforms + * Update Torbutton to 1.9.7.6 + * Bug 22989: Fix dimensions of new windows on macOS + * Translations update + * Update HTTPS-Everywhere to 2017.8.31 + * Update NoScript to 5.0.9 + * Bug 23166: Add new obfs4 bridge to the built-in ones + * Bug 23258: Fix broken HTTPS-Everywhere on higher security levels + * Bug 21270: NoScript settings break WebExtensions add-ons + Tor Browser 7.5a4 -- August 9 2017 * All Platforms * Update Firefox to 52.3.0esr

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit 945f0018487de8977628ccb1cded278de1685af4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 07:20:14 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index aa0c5a8..f6c37f9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 7.0.5 -- September 4 2017 + * All Platforms + * Update Torbutton to 1.9.7.6 + * Bug 22989: Fix dimensions of new windows on macOS + * Translations update + * Update HTTPS-Everywhere to 2017.8.31 + * Update NoScript to 5.0.9 + * Bug 23166: Add new obfs4 bridge to the built-in ones + * Bug 23258: Fix broken HTTPS-Everywhere on higher security levels + * Bug 21270: NoScript settings break WebExtensions add-ons + Tor Browser 7.5a4 -- August 9 2017 * All Platforms * Update Firefox to 52.3.0esr

1 0