diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-20 10:33:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-20 10:33:18 -0400 |
| commit | 023ce9e0f8701aa67c7eab29582454ee01b517dc (patch) | |
| tree | 99c86588348173dbae7691f43f836cdc3bc0fa85 | |
| parent | 334f4f60e88ae44450983e1d96bb783cd373455e (diff) | |
| parent | 3202ac60067a0350bfea1d04fdfd1680aeb661dd (diff) | |
| download | tor-023ce9e0f8701aa67c7eab29582454ee01b517dc.tar.gz tor-023ce9e0f8701aa67c7eab29582454ee01b517dc.zip | |
Merge branch 'maint-0.2.5' into release-0.2.5
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9e2b43d7d8..4b98b9cfd1 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.9-rc]) +AC_INIT([tor],[0.2.5.9-rc-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 81f963ce06..88116ec850 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.9-rc" +!define VERSION "0.2.5.9-rc-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 5fdf6dbe33..2c2ff7eb16 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.9-rc" +#define VERSION "0.2.5.9-rc-dev" |