January 2019 - tor-commits - lists.torproject.org

[tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump.

1 0

[tor/maint-0.3.5] Bump to 0.3.4.10
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:22:42 2019 -0500 Bump to 0.3.4.10 --- 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 14c87cd1b..8188dc451 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.9-dev]) +AC_INIT([tor],[0.3.4.10]) 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 92de55778..f5268249e 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.9-dev" +!define VERSION "0.3.4.10" !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 1f1e56e76..1de4c66a4 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.9-dev" +#define VERSION "0.3.4.10"

1 0

[tor/master] Bump to 0.3.3.11
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- 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 a651a7b5f..a5e1faf4e 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.10-dev]) +AC_INIT([tor],[0.3.3.11]) 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 fbf7e9afe..aaee0e77e 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.10-dev" +!define VERSION "0.3.3.11" !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 72489d702..2131d4f43 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.10-dev" +#define VERSION "0.3.3.11"

1 0

[tor/maint-0.3.5] Bump version to 0.3.5.7
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit 52b508735f4e3a58e6d9c808f7815bba66f5190e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:23:21 2019 -0500 Bump version to 0.3.5.7 --- 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 d992b8d01..05e1392cf 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.6-rc-dev]) +AC_INIT([tor],[0.3.5.7]) 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 d64808e19..0202a4db2 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.6-rc-dev" +!define VERSION "0.3.5.7" !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 4645d4a20..8522169c8 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.6-rc-dev" +#define VERSION "0.3.5.7"

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c Merge: 85c5f5850 ea47563dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:22:47 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.

1 0

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

07 Jan '19

commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c Merge: 85c5f5850 ea47563dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:22:47 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.

1 0

[tor/master] Bump version to 0.3.5.7
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit 52b508735f4e3a58e6d9c808f7815bba66f5190e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:23:21 2019 -0500 Bump version to 0.3.5.7 --- 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 d992b8d01..05e1392cf 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.6-rc-dev]) +AC_INIT([tor],[0.3.5.7]) 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 d64808e19..0202a4db2 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.6-rc-dev" +!define VERSION "0.3.5.7" !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 4645d4a20..8522169c8 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.6-rc-dev" +#define VERSION "0.3.5.7"

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit d199519706e13370597a158130ffe5e3a5ddea72 Merge: 0402746a9 52b508735 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:23:30 2019 -0500 Merge branch 'maint-0.3.5' "ours" to avoid version bump.

1 0

[tor/master] Bump to 0.3.4.10
by nickm＠torproject.org 07 Jan '19

07 Jan '19

commit ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 10:22:42 2019 -0500 Bump to 0.3.4.10 --- 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 14c87cd1b..8188dc451 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.9-dev]) +AC_INIT([tor],[0.3.4.10]) 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 92de55778..f5268249e 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.9-dev" +!define VERSION "0.3.4.10" !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 1f1e56e76..1de4c66a4 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.9-dev" +#define VERSION "0.3.4.10"

1 0