tor-commits December 2021

tor-commits@lists.torproject.org

15 participants
1464 discussions

[tor/maint-0.4.6] configure: Remove typo created by CI patch
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 413e0c7575c27c6a8e66ed19d088be636a70ffbd Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 13:03:23 2021 -0500 configure: Remove typo created by CI patch Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8d77635d99..2cd55798f5 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.6.9-dev])) +AC_INIT([tor],[0.4.6.9-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/main] configure: Remove typo created by CI patch
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit c6486da83de8fae6de7cac7b3b7eced23da80467 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 13:03:51 2021 -0500 configure: Remove typo created by CI patch Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3619ab56a3..24a373ab2f 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.7.3-alpha-dev])) +AC_INIT([tor],[0.4.7.3-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/main] Merge branch 'maint-0.4.6'
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 0fe3eae3ee78cb0c16f2286e33ab44077c45ecc0 Merge: 5591a3bcd6 413e0c7575 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 13:03:43 2021 -0500 Merge branch 'maint-0.4.6'

1 0

[tor/release-0.4.6] configure: Remove typo created by CI patch
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 10cd73761d7d8a49ba64ddad5a8f31b5a95cb3a7 Merge: 88a3edb1c8 413e0c7575 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 13:03:30 2021 -0500 Merge branch 'maint-0.4.6' into release-0.4.6 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/main] Merge remote-tracking branch 'tor-gitlab/mr/504'
by nickm＠torproject.org 16 Dec '21

16 Dec '21

commit 5591a3bcd6f80ab301e8750930de1c7bca78387c Merge: ecffdb0b17 a86918d524 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 16 12:36:35 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/504' src/ext/ed25519/donna/test-ticks.h | 4 ++-- src/feature/client/entrynodes.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/main] fix syntax errors listed by cppcheck
by nickm＠torproject.org 16 Dec '21

16 Dec '21

commit a86918d524806d34cbcac9c42fc7616ddc4a5fd1 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Dec 10 22:44:43 2019 +0100 fix syntax errors listed by cppcheck --- src/ext/ed25519/donna/test-ticks.h | 4 ++-- src/feature/client/entrynodes.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ext/ed25519/donna/test-ticks.h b/src/ext/ed25519/donna/test-ticks.h index 0103e03dde..16cec9ba92 100644 --- a/src/ext/ed25519/donna/test-ticks.h +++ b/src/ext/ed25519/donna/test-ticks.h @@ -13,7 +13,7 @@ get_ticks(void) { __asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi)); return ((uint64_t)lo | ((uint64_t)hi << 32)); #else - need rdtsc for this compiler + #error need rdtsc for this compiler #endif #elif defined(OS_SOLARIS) return (uint64_t)gethrtime(); @@ -35,7 +35,7 @@ get_ticks(void) { t = ((uint64_t)t2.tv_usec << 32) | (uint64_t)t2.tv_sec; return t; #else - need ticks for this platform + #error need ticks for this platform #endif } diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 32ecb4f705..15f29d1c3e 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2743,7 +2743,7 @@ entry_guards_upgrade_waiting_circuits(guard_selection_t *gs, {NONPRIMARY_GUARD_CONNECT_TIMEOUT} seconds." */ circuit_guard_state_t *state = origin_circuit_get_guard_state(circ); - if BUG((state == NULL)) + if (BUG(state == NULL)) continue; if (state->state != GUARD_CIRC_STATE_COMPLETE) continue;

1 0

[tor/main] changelog: Fix ReleaseNotes leftover from CI
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 8a63deb84f885c0d47a0ae10406db55c03988536 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 11:06:26 2021 -0500 changelog: Fix ReleaseNotes leftover from CI Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- ReleaseNotes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index 926b090214..c5a297d3db 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -2,9 +2,11 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. -INSERT SUMMARY BLURP - Changes in version 0.4.7.3-alpha - 2021-12-15 + This third alpha release of the 0.4.7.x series fixes several bugs including + two major ones affecting Bridges and Relays (see below). If you are running + an earlier 0.4.7.x version, you should upgrade to this version. + o Major bugfixes (bridges): - Make Tor work reliably again when you have multiple bridges configured and one or more of them are unreachable. The problem

1 0

[tor/main] version: Bump version to 0.4.7.3-alpha-dev
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 475d669f6211b8cb21563163189fcff6e46994c7 Author: Tor CI Release <no-email(a)torproject.org> Date: Thu Dec 16 15:01:28 2021 +0000 version: Bump version to 0.4.7.3-alpha-dev --- 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 4c0b2e5d43..3619ab56a3 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.7.3-alpha]) +AC_INIT([tor],[0.4.7.3-alpha-dev])) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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, ["2021-12-15"], # for 0.4.7.3-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-12-16"], # for 0.4.7.3-alpha-dev [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 a6150bc223..60389afc5e 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.7.3-alpha" +!define VERSION "0.4.7.3-alpha-dev" !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 da476c5504..036314d39a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.7.3-alpha" +#define VERSION "0.4.7.3-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/main] version: Bump version to 0.4.6.9-dev
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 00d7337002985edd2e15982e33fdd19001dc181c Author: Tor CI Release <no-email(a)torproject.org> Date: Thu Dec 16 15:01:28 2021 +0000 version: Bump version to 0.4.6.9-dev --- 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 303b70872f..8d77635d99 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.6.9]) +AC_INIT([tor],[0.4.6.9-dev])) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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, ["2021-12-15"], # for 0.4.6.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-12-16"], # for 0.4.6.9-dev [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 804c780510..9ac9026223 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.6.9" +!define VERSION "0.4.6.9-dev" !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 e11894f9d9..141a603e2e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.9" +#define VERSION "0.4.6.9-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2021