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

[tor/release-0.4.4] Bump to 0.4.3.6-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 3517d203227284d41ead62d65e90b38b9f11186e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:15:15 2020 -0400 Bump to 0.4.3.6-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 a7c7c06ff..e28f957d0 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.3.6]) +AC_INIT([tor],[0.4.3.6-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, ["2020-07-09"], # for 0.4.3.6 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.3.6-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 7f2242c95..f1de58e70 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.3.6" +!define VERSION "0.4.3.6-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 886c47925..ee203da68 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.3.6" +#define VERSION "0.4.3.6-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.4] Bump to 0.4.2.8-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 49b4d1765c8595fbcfd23ba322cc454875ed1033 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:14:48 2020 -0400 Bump to 0.4.2.8-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 8cd15c82e..af143e44a 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.8]) +AC_INIT([tor],[0.4.2.8-dev]) 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, ["2020-07-09"], # for 0.4.2.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.2.8-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 7a2ab0d63..ababaa38f 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.8" +!define VERSION "0.4.2.8-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 805fdaae2..38464f1c5 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.8" +#define VERSION "0.4.2.8-dev"

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit aaf8165cd1c28470b0d8007cf2ea161582b57d6b Merge: 50b503a9f 20e278735 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:16:00 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 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/release-0.4.4] Bump to 0.4.4.2-alpha-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 20e278735267fa7bbd0475e4866c488581c9ea70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:15:45 2020 -0400 Bump to 0.4.4.2-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 1e76ddd14..723c4ebbd 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.4.2-alpha]) +AC_INIT([tor],[0.4.4.2-alpha-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, ["2020-07-09"], # for 0.4.4.2-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.4.2-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 67b318d1f..5e9667726 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.4.2-alpha" +!define VERSION "0.4.4.2-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 beb2561ee..a06dac67c 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.4.2-alpha" +#define VERSION "0.4.4.2-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit eb6fc9f9bd89a02088af1cfa6fb4e39fe15ea9fc Merge: 3efd60474 3517d2032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:15:23 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 `-s ours` to avoid version bump.

1 0

[tor/maint-0.4.3] Bump to 0.3.5.11-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit c9751e26119e375fcbc74107e89958957c00ee5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:12:45 2020 -0400 Bump to 0.3.5.11-dev --- 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 24f1eeda3..f30a7efa9 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.3.5.11]) +AC_INIT([tor],[0.3.5.11-dev]) 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 e4af442c0..638754153 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.11" +!define VERSION "0.3.5.11-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 521f54192..ec7a5b242 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.11" +#define VERSION "0.3.5.11-dev"

1 0

[tor/maint-0.3.5] Bump to 0.3.5.11-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit c9751e26119e375fcbc74107e89958957c00ee5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:12:45 2020 -0400 Bump to 0.3.5.11-dev --- 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 24f1eeda3..f30a7efa9 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.3.5.11]) +AC_INIT([tor],[0.3.5.11-dev]) 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 e4af442c0..638754153 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.11" +!define VERSION "0.3.5.11-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 521f54192..ec7a5b242 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.11" +#define VERSION "0.3.5.11-dev"

1 0

[tor/maint-0.4.3] Bump to 0.4.2.8-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 49b4d1765c8595fbcfd23ba322cc454875ed1033 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:14:48 2020 -0400 Bump to 0.4.2.8-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 8cd15c82e..af143e44a 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.8]) +AC_INIT([tor],[0.4.2.8-dev]) 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, ["2020-07-09"], # for 0.4.2.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.2.8-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 7a2ab0d63..ababaa38f 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.8" +!define VERSION "0.4.2.8-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 805fdaae2..38464f1c5 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.8" +#define VERSION "0.4.2.8-dev"

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 6e01d5e68506056b1c9ec6b19a60911b15512bd8 Merge: 5aaecf6d0 c9751e261 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:14:22 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 `-s ours` to avoid version bump.

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 6e01d5e68506056b1c9ec6b19a60911b15512bd8 Merge: 5aaecf6d0 c9751e261 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:14:22 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 `-s ours` to avoid version bump.

1 0