diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-25 09:29:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-25 09:29:00 -0400 |
| commit | e1af8fd61757fa50380111b047219e942935a2c5 (patch) | |
| tree | 7b12d10af8053119e71a30ce33001923cad1e0ec | |
| parent | fbe15d1d7a28e480408904347092e107d6de1545 (diff) | |
| parent | 151d5ededf9fb334a5195904945f95cf626f51bc (diff) | |
| download | tor-e1af8fd61757fa50380111b047219e942935a2c5.tar.gz tor-e1af8fd61757fa50380111b047219e942935a2c5.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 786b4b095e..f2c3f90baa 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.13]) +AC_INIT([tor],[0.2.9.13-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 cd414dd437..919115b756 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.13" +!define VERSION "0.2.9.13-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 a249ba8c57..9c9166be18 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.13" +#define VERSION "0.2.9.13-dev" |