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

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3211e6704b6b6b967c09575a3473dce9f72649ce Merge: 7c81abb b049a5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:39:07 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3e07a54928c3b14b4eb86b05251564c3e16504c4 Merge: 67cec75 f93bcab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:38:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 This is an "ours" merge to avoid taking a version bump

1 0

[tor/release-0.2.9] bump version to 0.2.8.13
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit f2a657c22bf47fe4fd8103a1117e1e46af30969c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:34:33 2017 -0500 bump version to 0.2.8.13 --- 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 200ea02..9c6d95d 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.12-dev]) +AC_INIT([tor],[0.2.8.13]) 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 7152e43..ae477b8 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.12-dev" +!define VERSION "0.2.8.13" !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 26f9950..b61f59f 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.12-dev" +#define VERSION "0.2.8.13"

1 0

[tor/release-0.2.9] bump to 0.2.6.11
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 57e778f882537b5c07465e87f763bcd032cc7ea1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:26:24 2017 -0500 bump to 0.2.6.11 --- 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 3654024..a79ea82 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.10-dev]) +AC_INIT([tor],[0.2.6.11]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4143cf4..6611bb8 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.6.10-dev" +!define VERSION "0.2.6.11" !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 82e7e65..59cd43e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.10-dev" +#define VERSION "0.2.6.11"

1 0

[tor/release-0.2.9] Bump version to 0.2.5.13
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 884b3717a92465a3d6ab31d819e4011d3d929b3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:23:20 2017 -0500 Bump version to 0.2.5.13 --- 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 29ba2fd..8f85dae 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.12]) +AC_INIT([tor],[0.2.5.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 2fb15b8..9661e10 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.5.12" +!define VERSION "0.2.5.13" !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 6d6cde4..aa04092 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.12" +#define VERSION "0.2.5.13"

1 0

[tor/release-0.2.9] Revert "Revert "Add hidserv-stats filname to our sandbox filter""
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3f5a710958bfa2e6d1c2a6d78b0718514f2f7350 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 10:13:20 2017 -0500 Revert "Revert "Add hidserv-stats filname to our sandbox filter"" This reverts commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661. The underlying revert was done in 0.2.6, since we aren't backporting seccomp2 loosening fixes to 0.2.6. But the fix (for 17354) already went out in 0.2.7.4-rc, so we shouldn't revert it in 0.2.7. --- changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug17354 b/changes/bug17354 new file mode 100644 index 0000000..53da007 --- /dev/null +++ b/changes/bug17354 @@ -0,0 +1,4 @@ + o Minor bugfixes (sandbox): + - Add the "hidserv-stats" filename to our sandbox filter for the + HiddenServiceStatistics option to work properly. Fixes bug 17354; + bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet. diff --git a/src/or/main.c b/src/or/main.c index 693d13c..9b3dbb5 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3200,6 +3200,7 @@ sandbox_init_filter(void) RENAME_SUFFIX2("stats", "exit-stats", ".tmp"); RENAME_SUFFIX2("stats", "buffer-stats", ".tmp"); RENAME_SUFFIX2("stats", "conn-stats", ".tmp"); + RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp"); RENAME_SUFFIX("hashed-fingerprint", ".tmp"); RENAME_SUFFIX("router-stability", ".tmp");

1 0

[tor/release-0.2.9] bump version to 0.2.9.10
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit b049a5b3989ab72c4e87ecd029fc1e6886f61371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:38:55 2017 -0500 bump version to 0.2.9.10 --- 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 f7bdd97..095f374 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.9.9-dev]) +AC_INIT([tor],[0.2.9.10]) 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 91eb5f2..987aa01 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.9.9-dev" +!define VERSION "0.2.9.10" !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 80d5cf0..540cfab 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.2.9.9-dev" +#define VERSION "0.2.9.10"

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06 Merge: f2a657c b5526be Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:37:25 2017 -0500 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 This is an "ours" merge to avoid taking a version bump, and to avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit b2b604ecb4df95526a309c9ff507dff942472daa Merge: aeb299b 4bab288 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:22:36 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid bumping version

1 0

[tor/release-0.2.9] Bump version to 0.2.7.7
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit b5526bef384524badbd1411ad9570e6373438b06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:27:20 2017 -0500 Bump version to 0.2.7.7 --- 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 d37c34d..80c4d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.7.6-dev]) +AC_INIT([tor],[0.2.7.7]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 08cef8d..f20c1a6 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.7.6-dev" +!define VERSION "0.2.7.7" !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 8b687c8..57385c9 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.7.6-dev" +#define VERSION "0.2.7.7"

1 0