diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:56 -0400 |
| commit | 8a556f996c63a6c1cec8f22948e5c84acafb8057 (patch) | |
| tree | 05d8fdc372a25d52be5738d16050d2be8780fff7 | |
| parent | 21a9e5371d39db388a56654afd0b7cd4d6b60182 (diff) | |
| parent | eb92d11f53dd2245f4cfd618bde3996e76b498cf (diff) | |
| download | tor-8a556f996c63a6c1cec8f22948e5c84acafb8057.tar.gz tor-8a556f996c63a6c1cec8f22948e5c84acafb8057.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 55e59e9eee..63f4f1f757 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.12]) +AC_INIT([tor],[0.2.6.12-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 4de6b1b253..576abd2364 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.12" +!define VERSION "0.2.6.12-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 22a9d666c5..4a2ae5bba3 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.12" +#define VERSION "0.2.6.12-dev" #define HAVE_STRUCT_SOCKADDR_IN6 |