diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-23 15:58:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-23 15:58:14 -0400 |
| commit | c04339810badd64f7bec9cf9f1716a9f37c58630 (patch) | |
| tree | 2ce52f31d404eae8c16d6ac1dcd31aeb2d6fa527 | |
| parent | da84aec55c299d8a43566c846bec761c8321a2e3 (diff) | |
| parent | ec19ecce4b553859b501c7279219e8a21549639a (diff) | |
| download | tor-c04339810badd64f7bec9cf9f1716a9f37c58630.tar.gz tor-c04339810badd64f7bec9cf9f1716a9f37c58630.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 6150e7baaf..3c80e71c57 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.8]) +AC_INIT([tor],[0.2.8.8-dev]) 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 a4c98cd468..25998d4272 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.8" +!define VERSION "0.2.8.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 2ca344807f..56def12f22 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.8" +#define VERSION "0.2.8.8-dev" |