diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-06 10:00:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-06 10:00:45 -0400 |
| commit | 39c056e207f6a0c624139bb7bdd8ad7e2810374c (patch) | |
| tree | ca067c6084f8703b05b72f8810aedbf92642a74d | |
| parent | c4e63b6705ce98a857eb341b79790b1440085fde (diff) | |
| parent | eb41214dbaf090ba9d556d2d501d2d486e2f8581 (diff) | |
| download | tor-39c056e207f6a0c624139bb7bdd8ad7e2810374c.tar.gz tor-39c056e207f6a0c624139bb7bdd8ad7e2810374c.zip | |
Merge branch 'maint-0.2.6' into release-0.2.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 5ea7708f7d..f88cfc2cea 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.6-dev]) +AC_INIT([tor],[0.2.6.7]) 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 dda8244485..53654607dd 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.6" +!define VERSION "0.2.6.7" !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 9b2a9b054a..e9591e19f8 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.6" +#define VERSION "0.2.6.7" |