diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-24 09:10:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-24 09:10:42 -0400 |
| commit | ee70e2ed6df64c10099350ec654dff65db21011c (patch) | |
| tree | 4af58e8aa7a22de97d9afd5f8282a286c4360922 | |
| parent | af51ac47e0f550339fc25a4b62d7b68a716f8b56 (diff) | |
| parent | 38a58076e921d561fa1e488a4b0f983b12300ca4 (diff) | |
| download | tor-ee70e2ed6df64c10099350ec654dff65db21011c.tar.gz tor-ee70e2ed6df64c10099350ec654dff65db21011c.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 ecff48f85d..eeec24e1c9 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.7-dev]) +AC_INIT([tor],[0.3.1.8]) 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 0373af3130..a8c8de99ea 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.7-dev" +!define VERSION "0.3.1.8" !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 e74d54a721..0de6aa2bec 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.7-dev" +#define VERSION "0.3.1.8" |