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

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0 Merge: cdaf9aec8 da29074fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:11:49 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "ours" to avoid bump

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit cff7cb858b2dfaacb0138bbe4637a80b58147f6a Merge: 43e400f34 36885f34f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:12:09 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid bump

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0 Merge: cdaf9aec8 da29074fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:11:49 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "ours" to avoid bump

1 0

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

07 Sep '18

commit 0d5aaef465f782d46f538b03fd962ba7007fca11 Merge: fa38bbb70 cff7cb858 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:12:27 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid bump.

1 0

[tor/master] Bump to 0.2.9.17
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit da29074fc4dce509aec048903e7e854a44c1d825 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:10:49 2018 -0400 Bump to 0.2.9.17 --- 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 5ac3579d7..61a0c3238 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.15-dev]) +AC_INIT([tor],[0.2.9.17]) 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 3a45741d8..0484641f9 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.2.9.15-dev" +!define VERSION "0.2.9.17" !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 badfab787..457c7469c 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.2.9.15-dev" +#define VERSION "0.2.9.17"

1 0

[tor/master] Bump to 0.3.3.10
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 43e400f340caf6d2f40b093d816f684d1163ce8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:11:18 2018 -0400 Bump to 0.3.3.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 4068b9f09..47dd53034 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.8-dev]) +AC_INIT([tor],[0.3.3.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 973ede1c0..5ecf20835 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.8-dev" +!define VERSION "0.3.3.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 8837cfce3..08f0048cb 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.8-dev" +#define VERSION "0.3.3.10"

1 0

[tor/master] Bump to 0.3.2.12
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit cdaf9aec8e7d81fb583075c9486f4af4216ded94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:11:07 2018 -0400 Bump to 0.3.2.12 --- 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 79d2f7e54..5b541d7c9 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.2.10-dev]) +AC_INIT([tor],[0.3.2.12]) 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 7f2220153..8c84e3659 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.2.10-dev" +!define VERSION "0.3.2.12" !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 f5186fd24..fcdc090d4 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.2.10-dev" +#define VERSION "0.3.2.12"

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit cff7cb858b2dfaacb0138bbe4637a80b58147f6a Merge: 43e400f34 36885f34f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:12:09 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid bump

1 0

[tor/release-0.2.9] Bump to 0.2.9.17
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit da29074fc4dce509aec048903e7e854a44c1d825 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:10:49 2018 -0400 Bump to 0.2.9.17 --- 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 5ac3579d7..61a0c3238 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.15-dev]) +AC_INIT([tor],[0.2.9.17]) 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 3a45741d8..0484641f9 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.2.9.15-dev" +!define VERSION "0.2.9.17" !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 badfab787..457c7469c 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.2.9.15-dev" +#define VERSION "0.2.9.17"

1 0

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

07 Sep '18

commit 9f0e8d8c032fadde93d2079d60eff289203a2fb9 Merge: 9ca1af9a8 0d5aaef46 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 15:14:03 2018 -0400 Merge branch 'maint-0.3.4'

1 0