diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-26 15:37:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-26 15:37:38 -0400 |
| commit | 75e22561a126d4d37162ce849adac7c01796a45c (patch) | |
| tree | d1913dbb123166f82612060615cb5a37c2e09f0f | |
| parent | 47d2e4f06ec26a79542865d054f01ea09304f59d (diff) | |
| parent | 7ae7e3c2d8feb60ff4787d7c71ee3c38cdc88b34 (diff) | |
| download | tor-75e22561a126d4d37162ce849adac7c01796a45c.tar.gz tor-75e22561a126d4d37162ce849adac7c01796a45c.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -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 a2632b8b92..c4d6bb19d3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.6]) +AC_INIT([tor],[0.3.0.6-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 39e4e7fb0f..b26c88b811 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.3.0.6" +!define VERSION "0.3.0.6-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 222bbf3504..40781c7bfa 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.6" +#define VERSION "0.3.0.6-dev" |