diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-29 16:37:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-29 16:37:21 -0400 |
| commit | 07862d84359360e6ea3d7fa2dfae47ad8f8fb264 (patch) | |
| tree | 4a6b258590830e5d0e8609acb3f1d39815ab4645 | |
| parent | d9c230e71222d0a531ea6f56082019daf2c34fc6 (diff) | |
| parent | a53573559fc97b0931ec67a0ad27b796c305ff06 (diff) | |
| download | tor-07862d84359360e6ea3d7fa2dfae47ad8f8fb264.tar.gz tor-07862d84359360e6ea3d7fa2dfae47ad8f8fb264.zip | |
Merge branch 'maint-0.3.1' into release-0.3.1
| -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 0c673d033d..bbc60c327c 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.1.3-alpha-dev]) +AC_INIT([tor],[0.3.1.4-alpha]) 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 d3df39135f..e1b8bc5c0a 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.1.3-alpha-dev" +!define VERSION "0.3.1.4-alpha" !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 696f6fee8b..668f0b61dd 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.1.3-alpha-dev" +#define VERSION "0.3.1.4-alpha" |