diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:39:07 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:39:07 -0500 |
commit | 3211e6704b6b6b967c09575a3473dce9f72649ce (patch) | |
tree | af6f199ca80df0d0e5e324074a09e92a5e10463f | |
parent | 7c81abba28ecfed492db19a6c9da18e5c3e38d4f (diff) | |
parent | b049a5b3989ab72c4e87ecd029fc1e6886f61371 (diff) | |
download | tor-3211e6704b6b6b967c09575a3473dce9f72649ce.tar.gz tor-3211e6704b6b6b967c09575a3473dce9f72649ce.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 f7bdd97e13..095f37462e 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.9-dev]) +AC_INIT([tor],[0.2.9.10]) 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 91eb5f222a..987aa01f2d 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.9-dev" +!define VERSION "0.2.9.10" !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 80d5cf050f..540cfab40a 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.9-dev" +#define VERSION "0.2.9.10" |