tor-commits October 2017

tor-commits@lists.torproject.org

17 participants
2004 discussions

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

1 0

[tor/maint-0.3.0] bump version in the other places :/
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 48a4d8e75..a179d8483 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.0.11-dev" +!define VERSION "0.3.0.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 7399f8178..47a00dc6d 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.0.11-dev" +#define VERSION "0.3.0.12"

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 24 Oct '17

24 Oct '17

1 0

[tor/maint-0.3.1] bump to 0.2.8.16
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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.8.15-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/maint-0.3.0] bump to 0.2.9.13
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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.12-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 24 Oct '17

24 Oct '17

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2017