diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:29:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:29:49 -0400 |
| commit | 6a6173a21443884df37cfd4f6046dbe7ef2f2519 (patch) | |
| tree | 0938fa5c37d8480fa95179cbfd3e544fc6fa6534 | |
| parent | 2cc6d8d5786508c3b1dd248efa447f693d21840a (diff) | |
| parent | 8239af0d9cb3e45e4c5ff04ab057450934e306cf (diff) | |
| download | tor-6a6173a21443884df37cfd4f6046dbe7ef2f2519.tar.gz tor-6a6173a21443884df37cfd4f6046dbe7ef2f2519.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 d54793af2f..b295bf5a19 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.10-dev]) +AC_INIT([tor],[0.2.9.11]) 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 5f3ac99648..1f7804638a 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.10-dev" +!define VERSION "0.2.9.11" !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 a54c0097ee..b5ab2bf11d 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.10-dev" +#define VERSION "0.2.9.11" |