diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-10 10:05:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-10 10:05:08 -0500 |
| commit | f01f8e18b80b195f49cb48561b85f6eaae85e8cb (patch) | |
| tree | bb95d327cf9dd267cb7e9d555409ee34a0b2402b | |
| parent | 6f3f753c219e5ad2a48ef26d3bf5c42f02c49f1b (diff) | |
| parent | 7fb19f1ca86ef313f45886380daade684e35c525 (diff) | |
| download | tor-f01f8e18b80b195f49cb48561b85f6eaae85e8cb.tar.gz tor-f01f8e18b80b195f49cb48561b85f6eaae85e8cb.zip | |
Merge branch 'maint-0.2.7' into release-0.2.7
| -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 3236a812f3..6c72971a26 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.5-dev]) +AC_INIT([tor],[0.2.7.6]) 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 8932c82187..07cc31519b 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.5-dev" +!define VERSION "0.2.7.6" !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 11b5546787..822e261df2 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.5-dev" +#define VERSION "0.2.7.6" |