diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-18 09:10:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-18 09:10:55 -0400 |
| commit | e0b77cd3194d705f9bca254f8a95e520070ca365 (patch) | |
| tree | 227eaa2ac7977b178a5324e1ee3eb0ceaf251096 | |
| parent | eea90546f65b6629dd7fcc74df407de3fa839ced (diff) | |
| parent | 77c671b7dd1b0bc61e69b97ab41af51bec669285 (diff) | |
| download | tor-e0b77cd3194d705f9bca254f8a95e520070ca365.tar.gz tor-e0b77cd3194d705f9bca254f8a95e520070ca365.zip | |
Merge branch 'maint-0.2.6' into release-0.2.6tor-0.2.6.5-rc
| -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 f04abfbb50..46851445b0 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.4-rc-dev]) +AC_INIT([tor],[0.2.6.5-rc]) 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 4a0350fd03..96fefcde7c 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.6.4-rc-dev" +!define VERSION "0.2.6.5-rc" !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 4d7a878d3d..d95ba334ff 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.4-rc-dev" +#define VERSION "0.2.6.5-rc" |