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

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit afee785417cba083c4914fd9b6db49498c2eb241 Merge: 9320100d6 532873a92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:14 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump

1 0

[tor/master] Bump to 0.3.3.4-rc
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 9320100d6eb4b3ce4f18d2b37783f92352521f15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:23:39 2018 -0400 Bump to 0.3.3.4-rc --- 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 27cb0323c..8cc509c43 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.3-alpha-dev]) +AC_INIT([tor],[0.3.4.4-rc]) 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 32f1f23e7..bdf310bc9 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.3-alpha-dev" +!define VERSION "0.3.4.4-rc" !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 757ea2945..45578f9bb 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.3-alpha-dev" +#define VERSION "0.3.4.4-rc"

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit afee785417cba083c4914fd9b6db49498c2eb241 Merge: 9320100d6 532873a92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:14 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump

1 0

[tor/release-0.3.4] Bump to 0.3.3.4-rc
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 9320100d6eb4b3ce4f18d2b37783f92352521f15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:23:39 2018 -0400 Bump to 0.3.3.4-rc --- 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 27cb0323c..8cc509c43 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.3-alpha-dev]) +AC_INIT([tor],[0.3.4.4-rc]) 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 32f1f23e7..bdf310bc9 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.3-alpha-dev" +!define VERSION "0.3.4.4-rc" !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 757ea2945..45578f9bb 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.3-alpha-dev" +#define VERSION "0.3.4.4-rc"

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 47859e11e505cd6c2437fb8006de44297b6b9d2f Merge: 790062d72 afee78541 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:37 2018 -0400 Merge branch 'maint-0.3.4' "Ours" to avoid version bump.

1 0

[tor/release-0.3.3] Bump to 0.3.3.8
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 532873a9243041d63f33dc0df37a9101828bd92d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:07 2018 -0400 Bump to 0.3.3.8 --- 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 bb0602f13..9b3fb0a53 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.7-dev]) +AC_INIT([tor],[0.3.3.8]) 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 15d0d32d6..a86b5cf3f 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.7-dev" +!define VERSION "0.3.3.8" !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 2fd983172..e66ab2b65 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.7-dev" +#define VERSION "0.3.3.8"

1 0

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

09 Jul '18

commit 2f3b9151ec55fbfe7467b7e0a5ee3fccd769c0e3 Merge: 92b3fc931 532873a92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:48 2018 -0400 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] Bump to 0.3.3.8
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 532873a9243041d63f33dc0df37a9101828bd92d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:07 2018 -0400 Bump to 0.3.3.8 --- 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 bb0602f13..9b3fb0a53 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.7-dev]) +AC_INIT([tor],[0.3.3.8]) 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 15d0d32d6..a86b5cf3f 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.7-dev" +!define VERSION "0.3.3.8" !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 2fd983172..e66ab2b65 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.7-dev" +#define VERSION "0.3.3.8"

1 0

[tor/master] Bump to 0.3.3.8
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 532873a9243041d63f33dc0df37a9101828bd92d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:07 2018 -0400 Bump to 0.3.3.8 --- 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 bb0602f13..9b3fb0a53 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.7-dev]) +AC_INIT([tor],[0.3.3.8]) 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 15d0d32d6..a86b5cf3f 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.7-dev" +!define VERSION "0.3.3.8" !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 2fd983172..e66ab2b65 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.7-dev" +#define VERSION "0.3.3.8"

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit afee785417cba083c4914fd9b6db49498c2eb241 Merge: 9320100d6 532873a92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:14 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump

1 0