tor-commits February 2019

tor-commits@lists.torproject.org

16 participants
1788 discussions

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit df70c44960aec3abc617b4d395bf5443c543cedc Merge: 506264791 fb309f6eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:23:22 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump

1 0

[tor/master] Bump to 0.4.0.2-alpha-dev
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 1bff5646e64a32b83dcf5ac5acf4e31b98382aae Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:25:33 2019 -0500 Bump to 0.4.0.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 6e60489a5..91a049844 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.0.2-alpha]) +AC_INIT([tor],[0.4.0.2-alpha-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, ["2019-02-21"], # for 0.4.0.2-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-02-21"], # for 0.4.0.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 eb961e616..c937ec2f7 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.0.2-alpha" +!define VERSION "0.4.0.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 0081bc455..017ed223e 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.0.2-alpha" +#define VERSION "0.4.0.2-alpha-dev"

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit e1079266e73c70cc0e5141249ebf3199a849017d Merge: 4a8a1f76e a56b9501f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:23:52 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.

1 0

[tor/release-0.3.3] Bump to 0.3.3.12-dev
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:22:56 2019 -0500 Bump to 0.3.3.12-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 5162a70e6..aaa0e9eac 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.3.12]) +AC_INIT([tor],[0.3.3.12-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index d24d1076b..e4dc0ab5f 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.3.12" +!define VERSION "0.3.3.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 472ab87b6..13e65955e 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.3.12" +#define VERSION "0.3.3.12-dev"

1 0

[tor/master] Bump to 0.3.5.8-dev
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 955ca72f956f2747809def40b99b87b5647ee8ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:24:42 2019 -0500 Bump to 0.3.5.8-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 b83310684..52cc877db 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.8]) +AC_INIT([tor],[0.3.5.8-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 5af1ca0dd..9d82c5c3d 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.8" +!define VERSION "0.3.5.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 3936dc850..8512da128 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.8" +#define VERSION "0.3.5.8-dev"

1 0

[tor/release-0.3.4] Bump to 0.3.4.11-dev
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:23:46 2019 -0500 Bump to 0.3.4.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 c8a641a4c..bb807094a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.4.11]) +AC_INIT([tor],[0.3.4.11-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index af0ce944a..18bc2a62c 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.4.11" +!define VERSION "0.3.4.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 3901be2f8..434b6dd4c 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.4.11" +#define VERSION "0.3.4.11-dev"

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit b83d46feb87d1a629a1798907cac279df257df05 Merge: f3e21c276 fb309f6eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:25:39 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 635c59d553e420c4c54b95ac56b7d52f53a53111 Merge: 4fd31340f a56b9501f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:25:39 2019 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Bump to 0.3.3.12-dev
by nickm＠torproject.org 21 Feb '19

21 Feb '19

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 9ac8c854354eac7178eb8e99384f34c5a7abd5f4 Merge: 658770a0f 1bff5646e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 13:25:54 2019 -0500 Merge branch 'maint-0.4.0' "ours" to avoid version bump.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2019