diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-18 15:18:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-18 15:18:26 -0400 |
| commit | c6e1080211f654f2f57c2604cee7ae6915a9261f (patch) | |
| tree | 1a33dd0df1625cf7173ac99cf633ddbdad6bbd66 | |
| parent | 3487d26de33b5c27107fcc97f34be656a377887f (diff) | |
| download | tor-c6e1080211f654f2f57c2604cee7ae6915a9261f.tar tor-c6e1080211f654f2f57c2604cee7ae6915a9261f.tar.gz | |
Bump version in master to 0.2.6.0-alpha-dev
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
4 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,6 @@ +Changes in version 0.2.6.1-alpha - 2014-??-?? + + Changes in version 0.2.5.5-alpha - 2014-06-18 Tor 0.2.5.5-alpha fixes a wide variety of remaining issues in the Tor 0.2.5.x release series, including a couple of DoS issues, some diff --git a/configure.ac b/configure.ac index 38d922206..0d3758170 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.5-alpha-dev]) +AC_INIT([tor],[0.2.6.0-alpha-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 f7c025e7d..f5c02dbb8 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.5-alpha-dev" +!define VERSION "0.2.6.0-alpha-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 4698a2cbe..2f1a53c86 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.5-alpha-dev" +#define VERSION "0.2.6.0-alpha-dev" |