diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-09-18 14:40:55 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-09-18 14:40:55 -0400 |
commit | 4cf9d65050bff2e9377ae654c7a513f89a0b3e37 (patch) | |
tree | e84a323a056573226793e5f3f87f29ac6e01b720 | |
parent | 2e47bfad4f596dc39ab31bc66056a07d05715270 (diff) | |
parent | 42e12a3537fef04ab77defd6cb5581add439de43 (diff) | |
download | tor-4cf9d65050bff2e9377ae654c7a513f89a0b3e37.tar.gz tor-4cf9d65050bff2e9377ae654c7a513f89a0b3e37.zip |
Merge branch 'maint-0.2.9' into release-0.2.9
-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 45019bebbc..76140cbd19 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.9.12]) +AC_INIT([tor],[0.2.9.12-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 eafedfa68b..df657d38b1 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.9.12" +!define VERSION "0.2.9.12-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 fc093daeb5..47992c0d89 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.12" +#define VERSION "0.2.9.12-dev" |