tor-commits June 2017

tor-commits@lists.torproject.org

13 participants
1918 discussions

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit db96d1b6b09afd616922723eb88be35f2f4b4fc1 Merge: 802d30d ddfb877 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:06:57 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 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.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit ddfb87724265f5926abd2469d9f7cbc3893e71a8 Merge: 90758b2 875b1fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:06:41 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit eb92d11f53dd2245f4cfd618bde3996e76b498cf Merge: 95a88f7 1a7af74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:05:59 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bump.

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 6e90d75061cea8a5bb09efe7c8a1cb0a7bc689d3 Merge: 5c47b92 2f6be06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:06:16 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8

1 0

[tor/maint-0.2.7-redux] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 1a7af7470fdd6173f1b876fc6fee2b171174b4ff Merge: f3804f5 ec3ce77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:05:37 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.

1 0

[tor/maint-0.2.8] Add -dev to version number.
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit f3804f5999c7eb5cdfddf039f623bcffb89732b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:05:13 2017 -0400 Add -dev to version number. --- 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 da797e5..4eeb34d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.14]) +AC_INIT([tor],[0.2.5.14-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3e55030..af09326 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.5.14" +!define VERSION "0.2.5.14-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 d45f51e..5e670c3 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.14" +#define VERSION "0.2.5.14-dev"

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Jun '17

08 Jun '17

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 2f6be06f6a0a563bc07c089bf498b1d3792ae01f Merge: 44c8cb9 eb92d11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:06:06 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bump.

1 0

[tor/maint-0.2.8] Add -dev to version number.
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 5c47b927478d9fbbb21448f10faed8310c2184de Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 14:05:22 2017 -0400 Add -dev to version number. --- 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 092aa74..eeced53 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.14]) +AC_INIT([tor],[0.2.8.14-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 ba0cf5c..863a49b 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.8.14" +!define VERSION "0.2.8.14-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 41ce26e..3b3d136 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.14" +#define VERSION "0.2.8.14-dev"

1 0

[tor/maint-0.2.9] Add -dev to version number.
by nickm＠torproject.org 08 Jun '17

08 Jun '17

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2017