diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-24 10:23:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-24 10:23:44 -0400 |
| commit | bb8c4e69ca5c8bcad7d66b2ad502ab35b1a5032b (patch) | |
| tree | 62bc6a49617b28e084e729186cfb404e388470cc | |
| parent | 5ebe7f216076df05dae218b7dc5ef37a0e18a9e5 (diff) | |
| parent | dfd6cf9ea2b3f84e868c71af909c26358db07dac (diff) | |
| download | tor-bb8c4e69ca5c8bcad7d66b2ad502ab35b1a5032b.tar.gz tor-bb8c4e69ca5c8bcad7d66b2ad502ab35b1a5032b.zip | |
Merge branch 'maint-0.2.6' into release-0.2.6tor-0.2.6.6
| -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 3adcc2b2e8..e57588144a 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.5-rc-dev]) +AC_INIT([tor],[0.2.6.6]) 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 3eb287fa4f..dda8244485 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.5-rc-dev" +!define VERSION "0.2.6.6" !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 608ae35781..9b2a9b054a 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.5-rc-dev" +#define VERSION "0.2.6.6" |