diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-26 13:30:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-26 13:30:44 -0400 |
| commit | a172303484aa23d420bdc1055c00c09830dce863 (patch) | |
| tree | 41bf5f8c3243a3aea4efabd57633cf84743fc3e0 | |
| parent | 43a0ae395dfb1301aa2468baf4345f17d5ec0b7c (diff) | |
| parent | 31b79f02ab240a114ba9420c9920b8767057b63f (diff) | |
| download | tor-a172303484aa23d420bdc1055c00c09830dce863.tar.gz tor-a172303484aa23d420bdc1055c00c09830dce863.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 45b28a2582..a2632b8b92 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-dev]) +AC_INIT([tor],[0.3.0.6]) 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 d758b53725..39e4e7fb0f 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-dev" +!define VERSION "0.3.0.6" !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 3d80a8ad05..222bbf3504 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-dev" +#define VERSION "0.3.0.6" |