diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-29 16:35:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-29 16:35:46 -0400 |
| commit | c552ce0e17f26ae00d781d7e7f88bf2cb530573b (patch) | |
| tree | 2ac9a327842e76a7443140e4620b6c895da15eaf | |
| parent | 7444f2daf97dc91ebb74eed90053bdddc99ec1c1 (diff) | |
| parent | 98ffb2e722316568b2bbec7969c12db3663081d9 (diff) | |
| download | tor-c552ce0e17f26ae00d781d7e7f88bf2cb530573b.tar.gz tor-c552ce0e17f26ae00d781d7e7f88bf2cb530573b.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 218de2949b..6c6eb6c054 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.8-dev]) +AC_INIT([tor],[0.3.0.9]) 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 010d3906f3..57821bc08b 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.8-dev" +!define VERSION "0.3.0.9" !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 231da06ed0..96d16bde71 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.8-dev" +#define VERSION "0.3.0.9" |