[tor] branch main updated (aa28535f67 -> 470d8ebc61)

List overview All Threads
Download

newer

older

[tor] branch maint-0.4.5 updated...

[tor] annotated tag tor-0.4.7.10...

gitolite role

12 Aug 2022 12 Aug '22

2:57 p.m.

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a change to branch main in repository tor.

from aa28535f67 Merge branch 'maint-0.4.7' new d52a5f2181 version: Bump version to 0.4.5.14-dev new 0915eb6862 Merge branch 'maint-0.4.5' into maint-0.4.6 new 83965eca26 version: Bump version to 0.4.6.12-dev new 42f72dc10c Merge branch 'maint-0.4.6' into maint-0.4.7 new 2dff82dc72 version: Bump version to 0.4.7.10-dev new 470d8ebc61 Merge branch 'maint-0.4.7'

The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.

Summary of changes:

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

Show replies by date

gitolite role

12 Aug 12 Aug

2:57 p.m.

New subject: [tor] 01/06: version: Bump version to 0.4.5.14-dev

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit d52a5f2181f44ddb387e9d9a40523054a1f80bff Author: Tor CI Release no-email@torproject.org AuthorDate: Fri Aug 12 14:33:25 2022 +0000

version: Bump version to 0.4.5.14-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 30a7e5803c..517b1164c5 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.5.14]) +AC_INIT([tor],[0.4.5.14-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4])

@@ -16,7 +16,7 @@ configure_flags="$*" # 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, ["2022-08-12"], # for 0.4.5.14 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-08-12"], # for 0.4.5.14-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 c064e93780..c89d9de778 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.5.14" +!define VERSION "0.4.5.14-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 87b374a09d..2a46b93d9d 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.5.14" +#define VERSION "0.4.5.14-dev"

#define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

gitolite role

2:57 p.m.

New subject: [tor] 02/06: Merge branch 'maint-0.4.5' into maint-0.4.6

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 0915eb6862967f79524a05b9243eae04337eed80 Merge: 111b2d3a9f d52a5f2181 Author: David Goulet dgoulet@torproject.org AuthorDate: Fri Aug 12 10:54:31 2022 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

gitolite role

2:57 p.m.

New subject: [tor] 03/06: version: Bump version to 0.4.6.12-dev

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 83965eca26d10ed21b8f34f15ac48b3ec23e51ff Author: Tor CI Release no-email@torproject.org AuthorDate: Fri Aug 12 14:33:26 2022 +0000

version: Bump version to 0.4.6.12-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 7d4ef074b8..2e3460609a 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.12]) +AC_INIT([tor],[0.4.6.12-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, ["2022-08-12"], # for 0.4.6.12 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-08-12"], # for 0.4.6.12-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 9ffef8912a..b335d418d9 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.12" +!define VERSION "0.4.6.12-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 0d6f7628f9..1de0828083 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.12" +#define VERSION "0.4.6.12-dev"

#define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

gitolite role

2:57 p.m.

New subject: [tor] 04/06: Merge branch 'maint-0.4.6' into maint-0.4.7

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 42f72dc10c5f2c41cf7a401527da4f4cd101305c Merge: f732a91a73 83965eca26 Author: David Goulet dgoulet@torproject.org AuthorDate: Fri Aug 12 10:54:47 2022 -0400

Merge branch 'maint-0.4.6' into maint-0.4.7

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

gitolite role

2:57 p.m.

New subject: [tor] 05/06: version: Bump version to 0.4.7.10-dev

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 2dff82dc72fcedea0dc382240ca8d0d09e8d2fa0 Author: Tor CI Release no-email@torproject.org AuthorDate: Fri Aug 12 14:33:28 2022 +0000

version: Bump version to 0.4.7.10-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 3b6e02dfe6..ba50fab0be 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.10]) +AC_INIT([tor],[0.4.7.10-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, ["2022-08-12"], # for 0.4.7.10 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-08-12"], # for 0.4.7.10-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 24302b116e..856f1ea4dc 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.10" +!define VERSION "0.4.7.10-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 5efcf90ad6..3bfd65e8ff 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.10" +#define VERSION "0.4.7.10-dev"

#define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

gitolite role

2:57 p.m.

New subject: [tor] 06/06: Merge branch 'maint-0.4.7'

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 470d8ebc61ef17a2219803f687198441866c804e Merge: aa28535f67 2dff82dc72 Author: David Goulet dgoulet@torproject.org AuthorDate: Fri Aug 12 10:55:08 2022 -0400

Merge branch 'maint-0.4.7'

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

867

Age (days ago)

867

Last active (days ago)

tor-commits@lists.torproject.org

6 comments

1 participants

tags (0)

participants (1)

gitolite role