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

[tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 0ea508ec6f540f0c768d993df257a9733fac4074 Merge: 3c691613c 5acf6f871 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:53 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.5] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 5acf6f8717d3dcaf170e4e1b07f688f0bfbc2ac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:32 2018 -0400 Bump to 0.3.4.9-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 ac0dd9667..0a89fa56f 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]) +AC_INIT([tor],[0.3.4.9-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 1a72ee30e..92de55778 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" +!define VERSION "0.3.4.9-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 dd53f6d03..1f1e56e76 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" +#define VERSION "0.3.4.9-dev"

1 0

[tor/maint-0.3.4] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 5acf6f8717d3dcaf170e4e1b07f688f0bfbc2ac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:32 2018 -0400 Bump to 0.3.4.9-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 ac0dd9667..0a89fa56f 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]) +AC_INIT([tor],[0.3.4.9-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 1a72ee30e..92de55778 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" +!define VERSION "0.3.4.9-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 dd53f6d03..1f1e56e76 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" +#define VERSION "0.3.4.9-dev"

1 0

[tor/maint-0.3.5] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 5acf6f8717d3dcaf170e4e1b07f688f0bfbc2ac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:32 2018 -0400 Bump to 0.3.4.9-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 ac0dd9667..0a89fa56f 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]) +AC_INIT([tor],[0.3.4.9-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 1a72ee30e..92de55778 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" +!define VERSION "0.3.4.9-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 dd53f6d03..1f1e56e76 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" +#define VERSION "0.3.4.9-dev"

1 0

[tor/master] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 5acf6f8717d3dcaf170e4e1b07f688f0bfbc2ac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:32 2018 -0400 Bump to 0.3.4.9-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 ac0dd9667..0a89fa56f 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]) +AC_INIT([tor],[0.3.4.9-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 1a72ee30e..92de55778 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" +!define VERSION "0.3.4.9-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 dd53f6d03..1f1e56e76 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" +#define VERSION "0.3.4.9-dev"

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 0ea508ec6f540f0c768d993df257a9733fac4074 Merge: 3c691613c 5acf6f871 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:53 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 0ea508ec6f540f0c768d993df257a9733fac4074 Merge: 3c691613c 5acf6f871 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:53 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 3d8fcbcbad6c1c41be2745ecfe9f08aad07cdf5f Merge: 339ff694a 0ea508ec6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:02:02 2018 -0400 Merge branch 'maint-0.3.5'

1 0

[tor/release-0.3.4] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 5acf6f8717d3dcaf170e4e1b07f688f0bfbc2ac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:32 2018 -0400 Bump to 0.3.4.9-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 ac0dd9667..0a89fa56f 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]) +AC_INIT([tor],[0.3.4.9-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 1a72ee30e..92de55778 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" +!define VERSION "0.3.4.9-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 dd53f6d03..1f1e56e76 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" +#define VERSION "0.3.4.9-dev"

1 0

[webwml/master] Mark 0.3.4.9 source as released
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit d5ab67cf4780f0b1fd64d8b7e6bd7600e6022074 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 12:52:21 2018 -0400 Mark 0.3.4.9 source as released --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8346bf23..7bb787d6 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.3.4.8 +export STABLETAG=tor-0.3.4.9 export DEVTAG=tor-0.3.5.3-alpha WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index d54479c7..154041f6 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,4 +1,4 @@ -<define-tag version-stable whitespace=delete>0.3.4.8</define-tag> +<define-tag version-stable whitespace=delete>0.3.4.9</define-tag> <define-tag version-alpha whitespace=delete>0.3.5.3-alpha</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0