diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 09:34:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 09:34:06 -0400 |
| commit | d7eef61147d37b45eac53d422025a7ce64392af4 (patch) | |
| tree | 0951775a4cac4b49d1099cc892839a084cf0cf2e | |
| parent | b05226f05c4a5de92cfa57e6de1b77622bfdf22a (diff) | |
| parent | b440560b8bdd6034ddf94720bf9e3683aca68f72 (diff) | |
| download | tor-d7eef61147d37b45eac53d422025a7ce64392af4.tar.gz tor-d7eef61147d37b45eac53d422025a7ce64392af4.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 8b13abdc4a..9c6b14bf4c 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.6-rc-dev]) +AC_INIT([tor],[0.3.1.7]) 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 ad21f72a20..7357ec6857 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.6-rc-dev" +!define VERSION "0.3.1.7" !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 446406521d..895d867d3b 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.6-rc-dev" +#define VERSION "0.3.1.7" |