diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-05 13:05:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-05 13:05:42 -0400 |
| commit | 1992ed67563f110c2fe87a97e5a03d1a442bdfa5 (patch) | |
| tree | 560259ac4a13800683158047e08b9bd77457065e | |
| parent | c174f060fa252c816461552bb0de2bf758dcd61f (diff) | |
| parent | 8f44d2822ed67fe64d86692a6f045e57ee3a7146 (diff) | |
| download | tor-1992ed67563f110c2fe87a97e5a03d1a442bdfa5.tar.gz tor-1992ed67563f110c2fe87a97e5a03d1a442bdfa5.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -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 7471f99e16..984565a27e 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.4-rc-dev]) +AC_INIT([tor],[0.2.8.5-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 7949c79aed..fc2c6db6b5 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.4-rc-dev" +!define VERSION "0.2.8.5-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 610ef2f611..7890819ec4 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.4-rc-dev" +#define VERSION "0.2.8.5-rc" |