diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-05 10:03:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-05 10:03:18 -0400 |
| commit | 11f8342586f15d22aeef5d6cfb74513c4704315b (patch) | |
| tree | b47779d43f4159efef622573280c9a79a50f5223 | |
| parent | 5eb2786600014d024484aa84d9ee42eed643798f (diff) | |
| parent | 06fe8a14c4ffc403cc5c6732158b0283951d97ba (diff) | |
| download | tor-11f8342586f15d22aeef5d6cfb74513c4704315b.tar.gz tor-11f8342586f15d22aeef5d6cfb74513c4704315b.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 b872992c54..45b28a2582 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.5-rc]) +AC_INIT([tor],[0.3.0.5-rc-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 4d9da4181b..d758b53725 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.5-rc" +!define VERSION "0.3.0.5-rc-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 a3d8f33df5..3d80a8ad05 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.5-rc" +#define VERSION "0.3.0.5-rc-dev" |