January 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Changelog for 0.4.1.8
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 84aa01aecb585fa6762be48b9c268e76835482f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 20:06:15 2020 -0500 Changelog for 0.4.1.8 --- ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++++++ changes/bug29819 | 8 -------- changes/bug32778 | 3 --- changes/bug32841 | 4 ---- changes/ticket32240 | 4 ---- changes/ticket32242 | 2 -- changes/ticket32407 | 4 ---- changes/ticket32629 | 4 ---- 8 files changed, 43 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 463962e3b..c0eaf8c71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,46 @@ +Changes in version 0.4.1.8 - 2019-01-3x + This release backports several bugfixes from later release series, + including some that had affected the Linux seccomp2 sandbox or Windows + services. If you're running with one of those configurations, you'll + probably want to upgrade; otherwise, you should be fine with your + current version of 0.4.1.x. + + o Major bugfixes (linux seccomp sandbox, backport from 0.4.3.1-alpha): + - Correct how we use libseccomp. Particularly, stop assuming that + rules are applied in a particular order or that more rules are + processed after the first match. Neither is the case! In + libseccomp <2.4.0 this lead to some rules having no effect. + libseccomp 2.4.0 changed how rules are generated, leading to a + different ordering, which in turn led to a fatal crash during + startup. Fixes bug 29819; bugfix on 0.2.5.1-alpha. Patch by + Peter Gerber. + - Fix crash when reloading logging configuration while the + experimental sandbox is enabled. Fixes bug 32841; bugfix on + 0.4.1.7. Patch by Peter Gerber. + + o Minor bugfixes (crash, backport form 0.4.2.4-rc): + - When running Tor with an option like --verify-config or + --dump-config that does not start the event loop, avoid crashing + if we try to exit early because of an error. Fixes bug 32407; + bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (windows service, backport from 0.4.3.1-alpha): + - Initialize the publish/subscribe system when running as a windows + service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. + + o Testing (backport from 0.4.3.1-alpha): + - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on + Ubuntu Bionic. Turning off the Sandbox is a work-around, until we + fix the sandbox errors in 32722. Closes ticket 32240. + - Re-enable the Travis CI macOS Chutney build, but don't let it + prevent the Travis job from finishing. (The Travis macOS jobs are + slow, so we don't want to have it delay the whole CI process.) + Closes ticket 32629. + + o Testing (continuous integration, backport from 0.4.3.1-alpha): + - Use zstd in our Travis Linux builds. Closes ticket 32242. + + Changes in version 0.4.1.7 - 2019-12-09 This release backports several bugfixes to improve stability and correctness. Anyone experiencing build problems or crashes with 0.4.1.6, diff --git a/changes/bug29819 b/changes/bug29819 deleted file mode 100644 index d37ac83d6..000000000 --- a/changes/bug29819 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (linux seccomp sandbox): - - Correct how we use libseccomp. Particularly, stop assuming that - rules are applied in a particular order or that more rules are - processed after the first match. Neither is the case! In libseccomp - <2.4.0 this lead to some rules having no effect. Libseccomp 2.4.0 - changed how rules are generated leading to a different ordering - which in turn lead to a fatal crash during startup. Fixes bug - 29819; bugfix on 0.2.5.1-alpha. Patch by Peter Gerber. diff --git a/changes/bug32778 b/changes/bug32778 deleted file mode 100644 index ccb610469..000000000 --- a/changes/bug32778 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (windows service): - - Initialize publish/subscribe system when running as a windows service. - Fixes bug 32778; bugfix on 0.4.1.1-alpha. diff --git a/changes/bug32841 b/changes/bug32841 deleted file mode 100644 index 48568f6a6..000000000 --- a/changes/bug32841 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (linux seccomp sandbox): - - Fix crash when reloading logging configuration while the - experimental sandbox is enabled. Fixes bug 32841; bugfix - on 0.4.1.7. Patch by Peter Gerber. diff --git a/changes/ticket32240 b/changes/ticket32240 deleted file mode 100644 index 35cc3df27..000000000 --- a/changes/ticket32240 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu - Bionic. Turning off the Sandbox is a work-around, until we fix the - sandbox errors in 32722. Closes ticket 32240. diff --git a/changes/ticket32242 b/changes/ticket32242 deleted file mode 100644 index d63d5a586..000000000 --- a/changes/ticket32242 +++ /dev/null @@ -1,2 +0,0 @@ - o Testing (continuous integration): - - Use zstd in our Travis Linux builds. Closes ticket 32242. diff --git a/changes/ticket32407 b/changes/ticket32407 deleted file mode 100644 index badb09abf..000000000 --- a/changes/ticket32407 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (crash): - - When running Tor with an option like --verify-config or --dump-config - that does not start the event loop, avoid crashing if we try to exit - early because of an error. Fixes bug 32407; bugfix on 0.3.3.1-alpha. diff --git a/changes/ticket32629 b/changes/ticket32629 deleted file mode 100644 index 740746c57..000000000 --- a/changes/ticket32629 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Re-enable the Travis CI macOS Chutney build, but allow the job to finish - before it finishes, because the Travis macOS jobs are slow. - Closes ticket 32629.

1 0

[tor/release-0.4.2] start a changelog for 0.4.2.6
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 60cd9f946c2155bd8231bc80d321ebaa98db0b49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:55:07 2020 -0500 start a changelog for 0.4.2.6 --- ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++++++ changes/bug29819 | 8 ------- changes/bug32771 | 4 ---- changes/bug32778 | 3 --- changes/bug32841 | 4 ---- changes/ticket32240 | 4 ---- changes/ticket32242 | 2 -- changes/ticket32629 | 4 ---- changes/ticket32705_disable | 7 ------- changes/ticket32765 | 4 ---- 10 files changed, 51 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f7808078..9a4b0a678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,54 @@ +Changes in version 0.4.2.6 - 2020-01-3x + This is the second stable release in the 0.4.2.x series. + + o Major bugfixes (linux seccomp sandbox, backport from 0.4.3.1-alpha): + - Correct how we use libseccomp. Particularly, stop assuming that + rules are applied in a particular order or that more rules are + processed after the first match. Neither is the case! In + libseccomp <2.4.0 this lead to some rules having no effect. + libseccomp 2.4.0 changed how rules are generated, leading to a + different ordering, which in turn led to a fatal crash during + startup. Fixes bug 29819; bugfix on 0.2.5.1-alpha. Patch by + Peter Gerber. + - Fix crash when reloading logging configuration while the + experimental sandbox is enabled. Fixes bug 32841; bugfix on + 0.4.1.7. Patch by Peter Gerber. + + o Minor bugfixes (logging, crash, backport from 0.4.3.1-alpha): + - Avoid a possible crash when trying to log a (fatal) assertion + failure about mismatched magic numbers in configuration objects. + Fixes bug 32771; bugfix on 0.4.2.1-alpha. + + o Minor bugfixes (windows service, backport from 0.4.3.1-alpha): + - Initialize the publish/subscribe system when running as a windows + service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. + + o Testing (backport from 0.4.3.1-alpha) + - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on + Ubuntu Bionic. Turning off the Sandbox is a work-around, until we + fix the sandbox errors in 32722. Closes ticket 32240. + - Re-enable the Travis CI macOS Chutney build, but don't let it + prevent the Travis job from finishing. (The Travis macOS jobs are + slow, so we don't want to have it delay the whole CI process.) + Closes ticket 32629. + + o Testing (continuous integration, backport from 0.4.3.1-alpha): + - Use zstd in our Travis Linux builds. Closes ticket 32242. + + o Minor bugfixes (testing, backport from 0.4.3.1-alpha): + - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the + test_practracker.sh script. Doing so caused a test failure. Fixes + bug 32705; bugfix on 0.4.2.1-alpha. + - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr when + skipping practracker checks. Fixes bug 32705; bugfix + on 0.4.2.1-alpha. + + o Minor bugfixes (correctness checks, backport from 0.4.3.1-alpha): + - Use GCC/Clang's printf-checking feature to make sure that + tor_assertf() arguments are correctly typed. Fixes bug 32765; + bugfix on 0.4.1.1-alpha. + + Changes in version 0.4.2.5 - 2019-12-09 This is the first stable release in the 0.4.2.x series. This series improves reliability and stability, and includes several stability and diff --git a/changes/bug29819 b/changes/bug29819 deleted file mode 100644 index d37ac83d6..000000000 --- a/changes/bug29819 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (linux seccomp sandbox): - - Correct how we use libseccomp. Particularly, stop assuming that - rules are applied in a particular order or that more rules are - processed after the first match. Neither is the case! In libseccomp - <2.4.0 this lead to some rules having no effect. Libseccomp 2.4.0 - changed how rules are generated leading to a different ordering - which in turn lead to a fatal crash during startup. Fixes bug - 29819; bugfix on 0.2.5.1-alpha. Patch by Peter Gerber. diff --git a/changes/bug32771 b/changes/bug32771 deleted file mode 100644 index 606bcf4be..000000000 --- a/changes/bug32771 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (logging, crash): - - Avoid a possible crash when trying to log a (fatal) assertion failure - about mismatched magic numbers in configuration objects. Fixes bug 32771; - bugfix on 0.4.2.1-alpha. diff --git a/changes/bug32778 b/changes/bug32778 deleted file mode 100644 index ccb610469..000000000 --- a/changes/bug32778 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (windows service): - - Initialize publish/subscribe system when running as a windows service. - Fixes bug 32778; bugfix on 0.4.1.1-alpha. diff --git a/changes/bug32841 b/changes/bug32841 deleted file mode 100644 index 48568f6a6..000000000 --- a/changes/bug32841 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (linux seccomp sandbox): - - Fix crash when reloading logging configuration while the - experimental sandbox is enabled. Fixes bug 32841; bugfix - on 0.4.1.7. Patch by Peter Gerber. diff --git a/changes/ticket32240 b/changes/ticket32240 deleted file mode 100644 index 35cc3df27..000000000 --- a/changes/ticket32240 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu - Bionic. Turning off the Sandbox is a work-around, until we fix the - sandbox errors in 32722. Closes ticket 32240. diff --git a/changes/ticket32242 b/changes/ticket32242 deleted file mode 100644 index d63d5a586..000000000 --- a/changes/ticket32242 +++ /dev/null @@ -1,2 +0,0 @@ - o Testing (continuous integration): - - Use zstd in our Travis Linux builds. Closes ticket 32242. diff --git a/changes/ticket32629 b/changes/ticket32629 deleted file mode 100644 index 740746c57..000000000 --- a/changes/ticket32629 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Re-enable the Travis CI macOS Chutney build, but allow the job to finish - before it finishes, because the Travis macOS jobs are slow. - Closes ticket 32629. diff --git a/changes/ticket32705_disable b/changes/ticket32705_disable deleted file mode 100644 index 6d5b0779a..000000000 --- a/changes/ticket32705_disable +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (testing): - - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the - test_practracker.sh script. Doing so caused a test failure. - Fixes bug 32705; bugfix on 0.4.2.1-alpha. - - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr - when skipping practracker checks. - Fixes bug 32705; bugfix on 0.4.2.1-alpha. diff --git a/changes/ticket32765 b/changes/ticket32765 deleted file mode 100644 index a9663a5df..000000000 --- a/changes/ticket32765 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (correctness checks): - - Use GCC/Clang's printf-checking feature to make sure that - tor_assertf() arguments are correctly typed. Fixes bug 32765; - bugfix on 0.4.1.1-alpha.

1 0

[tor/release-0.4.2] Write a blurb for 0.4.2.6
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit db34b2fb2588dbfd62e00c7a0b0a1ade39633f4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:58:05 2020 -0500 Write a blurb for 0.4.2.6 --- ChangeLog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 33aec7cf8..4d2ca4f50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Changes in version 0.4.2.6 - 2020-01-3x - This is the second stable release in the 0.4.2.x series. + This is the second stable release in the 0.4.2.x series. It backports + several bugfixes from 0.4.3.1-alpha, including some that had affected + the Linux seccomp2 sandbox or Windows services. If you're running with + one of those configurations, you'll probably want to upgrade; + otherwise, you should be fine with 0.4.2.5. o Major bugfixes (linux seccomp sandbox, backport from 0.4.3.1-alpha): - Correct how we use libseccomp. Particularly, stop assuming that

1 0

[tor/release-0.4.2] Sort 0.4.2.6 changelog.
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 4177746f96aa2bcc074fb2d64d8780f90a006228 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:56:02 2020 -0500 Sort 0.4.2.6 changelog. --- ChangeLog | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a4b0a678..33aec7cf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,16 +14,29 @@ Changes in version 0.4.2.6 - 2020-01-3x experimental sandbox is enabled. Fixes bug 32841; bugfix on 0.4.1.7. Patch by Peter Gerber. + o Minor bugfixes (correctness checks, backport from 0.4.3.1-alpha): + - Use GCC/Clang's printf-checking feature to make sure that + tor_assertf() arguments are correctly typed. Fixes bug 32765; + bugfix on 0.4.1.1-alpha. + o Minor bugfixes (logging, crash, backport from 0.4.3.1-alpha): - Avoid a possible crash when trying to log a (fatal) assertion failure about mismatched magic numbers in configuration objects. Fixes bug 32771; bugfix on 0.4.2.1-alpha. + o Minor bugfixes (testing, backport from 0.4.3.1-alpha): + - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the + test_practracker.sh script. Doing so caused a test failure. Fixes + bug 32705; bugfix on 0.4.2.1-alpha. + - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr when + skipping practracker checks. Fixes bug 32705; bugfix + on 0.4.2.1-alpha. + o Minor bugfixes (windows service, backport from 0.4.3.1-alpha): - Initialize the publish/subscribe system when running as a windows service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. - o Testing (backport from 0.4.3.1-alpha) + o Testing (backport from 0.4.3.1-alpha): - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu Bionic. Turning off the Sandbox is a work-around, until we fix the sandbox errors in 32722. Closes ticket 32240. @@ -35,19 +48,6 @@ Changes in version 0.4.2.6 - 2020-01-3x o Testing (continuous integration, backport from 0.4.3.1-alpha): - Use zstd in our Travis Linux builds. Closes ticket 32242. - o Minor bugfixes (testing, backport from 0.4.3.1-alpha): - - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the - test_practracker.sh script. Doing so caused a test failure. Fixes - bug 32705; bugfix on 0.4.2.1-alpha. - - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr when - skipping practracker checks. Fixes bug 32705; bugfix - on 0.4.2.1-alpha. - - o Minor bugfixes (correctness checks, backport from 0.4.3.1-alpha): - - Use GCC/Clang's printf-checking feature to make sure that - tor_assertf() arguments are correctly typed. Fixes bug 32765; - bugfix on 0.4.1.1-alpha. - Changes in version 0.4.2.5 - 2019-12-09 This is the first stable release in the 0.4.2.x series. This series

1 0

[tor/master] bump to 0.4.1.8
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:42:24 2020 -0500 bump to 0.4.1.8 --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9e31b3bd6..82e3f57f4 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.1.7-dev]) +AC_INIT([tor],[0.4.1.8]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.1.8 [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index b50746779..dfd8a1e0a 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.4.1.7-dev" +!define VERSION "0.4.1.8" !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 dccf73154..50a588e31 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.4.1.7-dev" +#define VERSION "0.4.1.8"

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 0fb407591b8e5e028884aa6e07b7b1550bd0c703 Merge: 7b6be02a9 ec7f99e6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:42:43 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "Ours" merge to avoid version bump.

1 0

[tor/release-0.4.1] bump to 0.4.1.8
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:42:24 2020 -0500 bump to 0.4.1.8 --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9e31b3bd6..82e3f57f4 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.1.7-dev]) +AC_INIT([tor],[0.4.1.8]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.1.8 [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index b50746779..dfd8a1e0a 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.4.1.7-dev" +!define VERSION "0.4.1.8" !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 dccf73154..50a588e31 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.4.1.7-dev" +#define VERSION "0.4.1.8"

1 0

[tor/master] Bump version to 0.4.2.6
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit f470b863a0fc8ebfff32f580e8da9f93525c9d56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:44:29 2020 -0500 Bump version to 0.4.2.6 --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0e4ecaa94..509ebcf22 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.2.5-dev]) +AC_INIT([tor],[0.4.2.6]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.2.5-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.2.6 [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index fab06e0e3..eeb44cf30 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.4.2.5-dev" +!define VERSION "0.4.2.6" !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 fb27f0276..41826faad 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.4.2.5-dev" +#define VERSION "0.4.2.6"

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 3090839168377f17998cd9c4b7321aab7d9286c8 Merge: d211b20fb ec7f99e6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:44:48 2020 -0500 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 39c5e1b84994c2f226a8530b930f215cc5ffb877 Merge: c1d4399c8 f470b863a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 19:44:34 2020 -0500 Merge branch 'maint-0.4.2' Use "-s ours" to avoid version bump.

1 0