diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-03 09:38:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-03 09:38:21 -0400 |
| commit | 7257d41aa76c3a65dd4311c92699df34e7591de2 (patch) | |
| tree | 30058b916534f49b8a30e0f6728577d13debde66 | |
| parent | 3e463312df673170a9e74b96e0101940050fd3ba (diff) | |
| parent | 6ec322822051a53e61ce0b97a5c63c66ae11fae7 (diff) | |
| download | tor-7257d41aa76c3a65dd4311c92699df34e7591de2.tar.gz tor-7257d41aa76c3a65dd4311c92699df34e7591de2.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 2e85814673..b872992c54 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.4-rc-dev]) +AC_INIT([tor],[0.3.0.5-rc]) 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 c690991db1..4d9da4181b 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.4-rc-dev" +!define VERSION "0.3.0.5-rc" !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 5272cd6c6c..a3d8f33df5 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.4-rc-dev" +#define VERSION "0.3.0.5-rc" |