November 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit d4724f1414d23cda7ae9a27f45cef9faf7e89544 Merge: 016246366 212bd9778 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 16:27:26 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 src/feature/hibernate/hibernate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[tor/release-0.3.5] Make the hibernate.c changes for systemd compile.
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 212bd9778b5c249f02f8fbdc1e8ccbe4c108f03a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 16:27:20 2018 -0500 Make the hibernate.c changes for systemd compile. --- src/feature/hibernate/hibernate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index 4c46c4fe2..6f8795cec 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -50,6 +50,16 @@ hibernating, phase 2: #include <unistd.h> #endif +#ifdef HAVE_SYSTEMD +# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) +/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse + * Coverity. Here's a kludge to unconfuse it. + */ +# define __INCLUDE_LEVEL__ 2 +# endif /* defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) */ +#include <systemd/sd-daemon.h> +#endif /* defined(HAVE_SYSTEMD) */ + /** Are we currently awake, asleep, running out of bandwidth, or shutting * down? */ static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL; @@ -821,6 +831,8 @@ hibernate_soft_limit_reached(void) return get_accounting_bytes() >= soft_limit; } +#define TOR_USEC_PER_SEC (1000000) + /** Called when we get a SIGINT, or when bandwidth soft limit is * reached. Puts us into "loose hibernation": we don't accept new * connections, but we continue handling old ones. */

1 0

[tor/master] Make the hibernate.c changes for systemd compile.
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 212bd9778b5c249f02f8fbdc1e8ccbe4c108f03a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 16:27:20 2018 -0500 Make the hibernate.c changes for systemd compile. --- src/feature/hibernate/hibernate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index 4c46c4fe2..6f8795cec 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -50,6 +50,16 @@ hibernating, phase 2: #include <unistd.h> #endif +#ifdef HAVE_SYSTEMD +# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) +/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse + * Coverity. Here's a kludge to unconfuse it. + */ +# define __INCLUDE_LEVEL__ 2 +# endif /* defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) */ +#include <systemd/sd-daemon.h> +#endif /* defined(HAVE_SYSTEMD) */ + /** Are we currently awake, asleep, running out of bandwidth, or shutting * down? */ static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL; @@ -821,6 +831,8 @@ hibernate_soft_limit_reached(void) return get_accounting_bytes() >= soft_limit; } +#define TOR_USEC_PER_SEC (1000000) + /** Called when we get a SIGINT, or when bandwidth soft limit is * reached. Puts us into "loose hibernation": we don't accept new * connections, but we continue handling old ones. */

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 8e3bae566aaa91d65cfcefef10ea8a4e3aeeb280 Merge: 2fb27d61e 212bd9778 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 16:27:26 2018 -0500 Merge branch 'maint-0.3.5' src/feature/hibernate/hibernate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[tor/release-0.3.5] One more comma weasel didn't like
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 0162463667edd85b0973a6cc182b66288585be92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 15:19:53 2018 -0500 One more comma weasel didn't like --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ea587cc08..b752aa36a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 - Tor 0.3.5.4-alpha includes numerous bugfixes on earlier versions, and + Tor 0.3.5.4-alpha includes numerous bugfixes on earlier versions and improves our continuous integration support. It continues our attempts to stabilize this alpha branch and build it into a foundation for an acceptable long-term-support release.

1 0

[tor/release-0.3.5] And yet more edits
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 082825a0a458d3098202b59989792325acba0b6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 15:18:46 2018 -0500 And yet more edits --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 284414f36..ea587cc08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,7 +67,7 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 onion service version and then look for invalid options. Previously, we did the reverse, but that broke existing configs which were pointed to a v2 service and had options like - HiddenServiceAuthorizeClient set Fixes bug 28127; bugfix on + HiddenServiceAuthorizeClient set. Fixes bug 28127; bugfix on 0.3.5.1-alpha. Patch by Neel Chauhan. o Minor bugfixes (portability): @@ -82,7 +82,7 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 o Minor bugfixes (relay shutdown, systemd): - Notify systemd of ShutdownWaitLength so it can be set to longer than systemd's TimeoutStopSec. In Tor's systemd service file, set - TimeoutSec to 60 seconds, to allow Tor some time to shut down. + TimeoutSec to 60 seconds to allow Tor some time to shut down. Fixes bug 28113; bugfix on 0.2.6.2-alpha. o Minor bugfixes (rust, also in 0.3.4.9):

1 0

[tor/release-0.3.5] More changelog edits
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit a073ebf1913f1dce9eb5149f9126f337d6f80ab4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 15:11:17 2018 -0500 More changelog edits --- ChangeLog | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2df827762..284414f36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,14 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 - Tor 0.3.5.4-alpha includes numerous bugfixes, and continues our - attempts to stabilize this alpha branch and build it into a foundation - for an acceptable long-term-support release. + Tor 0.3.5.4-alpha includes numerous bugfixes on earlier versions, and + improves our continuous integration support. It continues our attempts + to stabilize this alpha branch and build it into a foundation for an + acceptable long-term-support release. o Major bugfixes (compilation, rust): - Rust tests can now build and run successfully with the --enable-fragile-hardening option enabled. Doing this currently requires the rust beta channel; it will be possible with stable - rust as of rust version 1.31 is out. Patch from Alex Crichton. + rust once Rust version 1.31 is released. Patch from Alex Crichton. Fixes bugs 27272, 27273, and 27274. Bugfix on 0.3.1.1-alpha. o Major bugfixes (embedding, main loop): @@ -19,7 +20,7 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 o Minor features (continuous integration): - Add a Travis CI build for --enable-nss on Linux gcc. Closes ticket 27751. - - Add new CI job to Travis configuration to runs stem-based + - Add new CI job to Travis configuration to run stem-based integration tests. Closes ticket 27913. o Minor features (Windows, continuous integration): @@ -36,8 +37,8 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 on 0.3.5.1-alpha. Patch from Kris Katterjohn. o Minor bugfixes (compilation, OpenSolaris): - - Add a missing include to compat_pthreads.c, to fix compilation on - OpenSolaris and its descendants. Fixes bug 27963; bugfix + - Fix compilation on OpenSolaris and its descendants by adding a + missing include to compat_pthreads.c. Fixes bug 27963; bugfix on 0.3.5.1-alpha. o Minor bugfixes (configuration): @@ -47,8 +48,8 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 o Minor bugfixes (directory authority, also in 0.3.4.9): - Log additional info when we get a relay that shares an ed25519 ID - with a different relay, instead making a BUG() warning. Fixes bug - 27800; bugfix on 0.3.2.1-alpha. + with a different relay, instead of a BUG() warning with a + backtrace. Fixes bug 27800; bugfix on 0.3.2.1-alpha. o Minor bugfixes (onion service v3): - Build the service descriptor's signing key certificate before @@ -80,8 +81,8 @@ Changes in version 0.3.5.4-alpha - 2018-11-07 o Minor bugfixes (relay shutdown, systemd): - Notify systemd of ShutdownWaitLength so it can be set to longer - than systemd's TimeoutStopSec. In tor's systemd service file, set - TimeoutSec to 60 seconds, to allow tor some time to shut down. + than systemd's TimeoutStopSec. In Tor's systemd service file, set + TimeoutSec to 60 seconds, to allow Tor some time to shut down. Fixes bug 28113; bugfix on 0.2.6.2-alpha. o Minor bugfixes (rust, also in 0.3.4.9):

1 0

[tor/master] Bump to 0.3.5.4-alpha
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit f229c4e66ae7f92fd02e93f2766ae37c07152ec5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 14:40:26 2018 -0500 Bump to 0.3.5.4-alpha --- 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 d0de6356d..1fc49fe90 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.3-alpha-dev]) +AC_INIT([tor],[0.3.5.4-alpha]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5c37dd7ce..088c3e4a6 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.5.3-alpha-dev" +!define VERSION "0.3.5.4-alpha" !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 4c89925d3..9eacbc31f 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.5.3-alpha-dev" +#define VERSION "0.3.5.4-alpha"

1 0

[tor/maint-0.3.5] Bump to 0.3.5.4-alpha
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit f229c4e66ae7f92fd02e93f2766ae37c07152ec5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 14:40:26 2018 -0500 Bump to 0.3.5.4-alpha --- 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 d0de6356d..1fc49fe90 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.3-alpha-dev]) +AC_INIT([tor],[0.3.5.4-alpha]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5c37dd7ce..088c3e4a6 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.5.3-alpha-dev" +!define VERSION "0.3.5.4-alpha" !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 4c89925d3..9eacbc31f 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.5.3-alpha-dev" +#define VERSION "0.3.5.4-alpha"

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 2fb27d61e7f58d2f572733c5908949460b89f17e Merge: c7b6ed1d8 f229c4e66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 14:40:34 2018 -0500 Merge branch 'maint-0.3.5' "ours" to avoid version bump.

1 0