diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:36:40 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:36:40 -0400 |
commit | fa6a228ce86c2737447f32c78eedc00083eb826c (patch) | |
tree | 7cee62c8a5313a3e3b50e2ba52b989e4cb95b40b | |
parent | 1cdb839108ef7487aaa516ab003d1afd7abfecc6 (diff) | |
parent | 3a0d42fbf97384526fb51de9a58e9b49bbccf2e8 (diff) | |
download | tor-0.2.8.4-rc.tar.gz tor-0.2.8.4-rc.zip |
Merge branch 'maint-0.2.8' into release-0.2.8tor-0.2.8.4-rc
-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 4976d7b16d..9d4e56d381 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.3-alpha-dev]) +AC_INIT([tor],[0.2.8.4-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 f1b9bbd263..72523cd969 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.2.8.3-alpha-dev" +!define VERSION "0.2.8.4-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 4e9c3ffdf7..a6c8402df6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.3-alpha-dev" +#define VERSION "0.2.8.4-rc" |