diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-05 08:31:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 08:31:01 -0400 |
| commit | b9c29105f1f8c6a5a50212b84e8dd06b7e9e4ff8 (patch) | |
| tree | 482e78361cf1334588be5fa1a276f49c644fbedc | |
| parent | bebf7eb54e0852eeefa4b8608354ab75f912050b (diff) | |
| parent | 2d55620a9eac89cd1dd43250899119485b505a15 (diff) | |
| download | tor-b9c29105f1f8c6a5a50212b84e8dd06b7e9e4ff8.tar.gz tor-b9c29105f1f8c6a5a50212b84e8dd06b7e9e4ff8.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 a7cf8f7393..33f74da558 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.5-alpha-dev]) +AC_INIT([tor],[0.3.1.6-rc]) 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 45b2db816c..d35b5c682a 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.5-alpha-dev" +!define VERSION "0.3.1.6-rc" !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 fc52ca3a17..1f6373e00b 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.5-alpha-dev" +#define VERSION "0.3.1.6-rc" |