diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-22 18:05:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-22 18:05:55 -0400 |
| commit | c11c851b390283271b2de6dd2cfd1512c9faa342 (patch) | |
| tree | 1cbbfc75a2d71390eedc503cc7d184647b403fee | |
| parent | 7dd0813e783ae16e6362e2e3c607476e645e2983 (diff) | |
| parent | ff27b7ce60b20ad831b3f0a92b49236103d47410 (diff) | |
| download | tor-c11c851b390283271b2de6dd2cfd1512c9faa342.tar.gz tor-c11c851b390283271b2de6dd2cfd1512c9faa342.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -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 fbe6450e88..f7e3c1e947 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.3.6]) +AC_INIT([tor],[0.3.3.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 164d275185..11ca7e2e3d 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.3.6" +!define VERSION "0.3.3.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 bb683e009e..5b3ea62f22 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.3.6" +#define VERSION "0.3.3.6-dev" |