diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:56 -0400 |
| commit | b2cab96029e2ea477215690d0bb403565e13ac56 (patch) | |
| tree | 552efcd2157848f835f96c0ca55a62d2bb797932 | |
| parent | f833164576c3343ab0f20bda903544f7b4dafdfe (diff) | |
| parent | ec3ce773ad1394441049337befc8ff7e0867b093 (diff) | |
| download | tor-b2cab96029e2ea477215690d0bb403565e13ac56.tar.gz tor-b2cab96029e2ea477215690d0bb403565e13ac56.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/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 6b4d009516..fe830abcb9 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.29]) +AC_INIT([tor],[0.2.4.29-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 4e00cb778e..537dec5dd8 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.29" +!define VERSION "0.2.4.29-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 5468455489..d2bb090e3a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.29" +#define VERSION "0.2.4.29-dev" |