diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-02 11:19:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-02 11:19:59 -0500 |
| commit | eede3a171a2b07b49270c1494576c2823ea8b6e2 (patch) | |
| tree | 7717d9d568e266419f6711458120cc527b4b42d9 | |
| parent | 74d091887c5405585e67694cd890c91766e87864 (diff) | |
| parent | 1122137fa013c414d480048c266259bd72f48452 (diff) | |
| download | tor-eede3a171a2b07b49270c1494576c2823ea8b6e2.tar.gz tor-eede3a171a2b07b49270c1494576c2823ea8b6e2.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 eb1fac3b2d..fb5d6d728b 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.10]) +AC_INIT([tor],[0.2.8.10-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 93e9516fa7..a36123f0c3 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.10" +!define VERSION "0.2.8.10-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 0a3d77acbe..923d520d47 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.10" +#define VERSION "0.2.8.10-dev" |