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

[tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 7c25b41c8cfffebddbc7ba4d66aa345642eebc1f Merge: 6e96aad 92891de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:52:04 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.2.8] whoops. changelog file for 19271.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 6b8c3d2bc020035c2627fa0ffcc22c036270e122 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:21 2016 -0400 whoops. changelog file for 19271. --- changes/19271 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changes/19271 b/changes/19271 new file mode 100644 index 0000000..dc06ead --- /dev/null +++ b/changes/19271 @@ -0,0 +1,2 @@ + o Directory authority changes: + - Urras is no longer a directory authority. Closes ticket 19271.

1 0

[tor/master] Fix shared-random test
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 5a047cdc5feebf33302cf28c0f6dc092df0e58a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:31:18 2016 -0400 Fix shared-random test --- src/test/test_shared_random.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 886cee3..4f05e75 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -868,7 +868,6 @@ test_sr_get_majority_srv_from_votes(void *arg) /* The test relies on the dirauth list being initialized. */ clear_dir_servers(); add_default_trusted_dir_authorities(V3_DIRINFO); - tt_int_op(get_n_authorities(V3_DIRINFO), ==, 9); { /* Prepare voting environment with just a single vote. */ networkstatus_t *vote = get_test_vote_with_curr_srv(SRV_1);

1 0

[tor/maint-0.2.8] Update version to 0.2.8.5-rc. This is not yet a release.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 8f44d2822ed67fe64d86692a6f045e57ee3a7146 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:05:36 2016 -0400 Update version to 0.2.8.5-rc. This is not yet a release. --- 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 7471f99..984565a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.4-rc-dev]) +AC_INIT([tor],[0.2.8.5-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 7949c79..fc2c6db 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.2.8.4-rc-dev" +!define VERSION "0.2.8.5-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 610ef2f..7890819 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.4-rc-dev" +#define VERSION "0.2.8.5-rc"

1 0

[tor/release-0.2.8] Update version to 0.2.8.5-rc. This is not yet a release.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 8f44d2822ed67fe64d86692a6f045e57ee3a7146 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:05:36 2016 -0400 Update version to 0.2.8.5-rc. This is not yet a release. --- 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 7471f99..984565a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.4-rc-dev]) +AC_INIT([tor],[0.2.8.5-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 7949c79..fc2c6db 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.2.8.4-rc-dev" +!define VERSION "0.2.8.5-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 610ef2f..7890819 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.4-rc-dev" +#define VERSION "0.2.8.5-rc"

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 0603779114920dabb3ec0178f2b646480619c372 Merge: 6ea9d3f 8f44d28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:06:06 2016 -0400 Merge branch 'maint-0.2.8' This is an "ours" merge, to avoid messing with the version.

1 0

[tor/master] Update version to 0.2.8.5-rc. This is not yet a release.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 8f44d2822ed67fe64d86692a6f045e57ee3a7146 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:05:36 2016 -0400 Update version to 0.2.8.5-rc. This is not yet a release. --- 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 7471f99..984565a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.4-rc-dev]) +AC_INIT([tor],[0.2.8.5-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 7949c79..fc2c6db 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.2.8.4-rc-dev" +!define VERSION "0.2.8.5-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 610ef2f..7890819 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.4-rc-dev" +#define VERSION "0.2.8.5-rc"

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 1992ed67563f110c2fe87a97e5a03d1a442bdfa5 Merge: c174f06 8f44d28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:05:42 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 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/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit aeb95c20919dbff13ee936fea7fda4a63a11f918 Merge: 6220cd1 717eae3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:58:18 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug19499 | 2 +- changes/bug19556 | 2 +- changes/bug19557 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.8] Appease lint-changes script.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 717eae3b8fc6c90915a1306a093c68a7024feb55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:57:43 2016 -0400 Appease lint-changes script. --- changes/bug19499 | 2 +- changes/bug19556 | 2 +- changes/bug19557 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug19499 b/changes/bug19499 index 5db49bb..59bdb29 100644 --- a/changes/bug19499 +++ b/changes/bug19499 @@ -1,4 +1,4 @@ o Minor features (build): - Tor now again builds with the recent OpenSSL 1.1 development branch - (tested against 1.1.0-pre6-dev). + (tested against 1.1.0-pre6-dev). Closes ticket 19499. diff --git a/changes/bug19556 b/changes/bug19556 index f4ac894..31856b3 100644 --- a/changes/bug19556 +++ b/changes/bug19556 @@ -4,4 +4,4 @@ private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. - Fixes bug 19556. + Fixes bug 19556; bugfix on 0.2.5.1-alpha. diff --git a/changes/bug19557 b/changes/bug19557 index 9036cdc..55214b0 100644 --- a/changes/bug19557 +++ b/changes/bug19557 @@ -1,4 +1,4 @@ o Major bugfixes (sandboxing): - Our sandboxing code would not allow us to write to stats/hidserv-stats, causing tor to abort while trying to write stats. This was previously - masked by bug 19556. Fixes bug 19557. + masked by bug 19556. Fixes bug 19557; bugfix on 0.2.6.1-alpha.

1 0