diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-10 08:21:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-10 08:21:53 -0400 |
| commit | 74f861b295fc59ae2567b5ec78e2a46d66e44630 (patch) | |
| tree | a07d40d58f189fd3b10af049613820c7b5c6ee9d | |
| parent | 0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70 (diff) | |
| parent | 99b59dee7046b04854ac263a1cf810dceb80df12 (diff) | |
| download | tor-74f861b295fc59ae2567b5ec78e2a46d66e44630.tar.gz tor-74f861b295fc59ae2567b5ec78e2a46d66e44630.zip | |
Merge branch 'maint-0.2.6' into release-0.2.6
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 0054627fe6..f04abfbb50 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]) +AC_INIT([tor],[0.2.6.4-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 8a3649de76..4a0350fd03 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" +!define VERSION "0.2.6.4-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 07c9b53d5a..4d7a878d3d 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" +#define VERSION "0.2.6.4-rc-dev" |