diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:28:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:28:39 -0500 |
| commit | 94ad23deb216651844ab31c17809afa2fc8f9da1 (patch) | |
| tree | 0106f97259ea6f662b841b859602f33d293a0b81 | |
| parent | d8d52f2b73eca2cfa868d157bdb66d5ba1be5c30 (diff) | |
| parent | 4ebd436541872addb62aeb5caa8ffb55fbcbd59e (diff) | |
| download | tor-94ad23deb216651844ab31c17809afa2fc8f9da1.tar.gz tor-94ad23deb216651844ab31c17809afa2fc8f9da1.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 644d7231da..5afcdddb08 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.8-dev]) +AC_INIT([tor],[0.3.1.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 61c2713c22..391d63c00e 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.8-dev" +!define VERSION "0.3.1.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 0a2efa3416..ccb82d0633 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.8-dev" +#define VERSION "0.3.1.9" |