diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:57 -0400 |
| commit | adc99834837fa3c4ccc1139734af83307ce2fcd3 (patch) | |
| tree | b809925a7c3cf347f8cdd66316847cca3abc778f | |
| parent | 3db01d3b565032c777e62d7049a29483a41120e3 (diff) | |
| parent | 2f6be06f6a0a563bc07c089bf498b1d3792ae01f (diff) | |
| download | tor-adc99834837fa3c4ccc1139734af83307ce2fcd3.tar.gz tor-adc99834837fa3c4ccc1139734af83307ce2fcd3.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 f754942a3a..42e5fa7f29 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.8]) +AC_INIT([tor],[0.2.7.8-dev]) 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 32c97318e8..7aae273d64 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.8" +!define VERSION "0.2.7.8-dev" !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 46714ef35f..f1caed6cdd 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.8" +#define VERSION "0.2.7.8-dev" |