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

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

08 Jan '19

commit 6fd998e2eebd9ce5bca67368eb71f4cc69504f40 Merge: 4f5ea89c1 41bb77822 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:18:47 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.5] Update to 0.3.3.3.11-dev
by nickm＠torproject.org 08 Jan '19

08 Jan '19

commit b5fdb91adaad7fd863856ad505665908bd24ea15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:16:40 2019 -0500 Update to 0.3.3.3.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 a5e1faf4e..285bf6bc1 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.11]) +AC_INIT([tor],[0.3.3.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 aaee0e77e..826d60de8 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.11" +!define VERSION "0.3.3.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 2131d4f43..b66b0390f 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.11" +#define VERSION "0.3.3.11-dev"

1 0

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

08 Jan '19

commit 50a686e586c0208e7aa9c3ea4e0210ab73cc0b71 Merge: ea47563dd b5fdb91ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:16:56 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "Ours" to avoid version bump.

1 0

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

08 Jan '19

commit f9e526629b746a9f85df1fe362eca500a19ccc87 Merge: 9beb085c1 44edfa7ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:18:47 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 08 Jan '19

08 Jan '19

commit 971f4bf13944864156684b3d3be8df53fb9d0686 Merge: 52b508735 41bb77822 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:17:46 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] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 08 Jan '19

08 Jan '19

commit 7b792b990c49ddbca782ee342bc6b0805b3f0868 Merge: 801af9a7e b5fdb91ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:18:47 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.5] Update to 0.3.5.7-dev
by nickm＠torproject.org 08 Jan '19

08 Jan '19

commit 44edfa7adcc3f9006397e525b0c4e333ea4ee429 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:18:25 2019 -0500 Update to 0.3.5.7-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 05e1392cf..3ef9b255e 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.7]) +AC_INIT([tor],[0.3.5.7-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 0202a4db2..1e869165e 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.7" +!define VERSION "0.3.5.7-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 8522169c8..496eb0ceb 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.7" +#define VERSION "0.3.5.7-dev"

1 0

[tor/release-0.3.5] Update to 0.3.4.10-dev
by nickm＠torproject.org 08 Jan '19

08 Jan '19

commit 41bb77822777b261991b74d2f7fb4dcad587c8c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:17:34 2019 -0500 Update to 0.3.4.10-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 8188dc451..199134606 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.10]) +AC_INIT([tor],[0.3.4.10-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 f5268249e..5150c2148 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.10" +!define VERSION "0.3.4.10-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 1de4c66a4..af2c725a1 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.10" +#define VERSION "0.3.4.10-dev"

1 0

[tor/maint-0.3.5] Update to 0.3.3.3.11-dev
by nickm＠torproject.org 08 Jan '19

08 Jan '19

commit b5fdb91adaad7fd863856ad505665908bd24ea15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:16:40 2019 -0500 Update to 0.3.3.3.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 a5e1faf4e..285bf6bc1 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.11]) +AC_INIT([tor],[0.3.3.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 aaee0e77e..826d60de8 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.11" +!define VERSION "0.3.3.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 2131d4f43..b66b0390f 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.11" +#define VERSION "0.3.3.11-dev"

1 0

[tor/maint-0.3.4] Update to 0.3.4.10-dev
by nickm＠torproject.org 08 Jan '19

08 Jan '19

commit 41bb77822777b261991b74d2f7fb4dcad587c8c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 21:17:34 2019 -0500 Update to 0.3.4.10-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 8188dc451..199134606 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.10]) +AC_INIT([tor],[0.3.4.10-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 f5268249e..5150c2148 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.10" +!define VERSION "0.3.4.10-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 1de4c66a4..af2c725a1 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.10" +#define VERSION "0.3.4.10-dev"

1 0