diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:27:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:27:29 -0500 |
| commit | 01a00d0f94e7d8f89cc5244c8b49bf27bc37f797 (patch) | |
| tree | d93e790aaff40826bca95073cd7ac220d17054c5 | |
| parent | 1fe5097132704f35761110bbf55fd77cdb0669b2 (diff) | |
| parent | b5526bef384524badbd1411ad9570e6373438b06 (diff) | |
| download | tor-01a00d0f94e7d8f89cc5244c8b49bf27bc37f797.tar.gz tor-01a00d0f94e7d8f89cc5244c8b49bf27bc37f797.zip | |
Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux
| -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 d37c34daae..80c4d3ce69 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.7.6-dev]) +AC_INIT([tor],[0.2.7.7]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 08cef8dfbc..f20c1a6209 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.7.6-dev" +!define VERSION "0.2.7.7" !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 8b687c8234..57385c957a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.7.6-dev" +#define VERSION "0.2.7.7" |