diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:57 -0400 |
| commit | db96d1b6b09afd616922723eb88be35f2f4b4fc1 (patch) | |
| tree | a14f7945f943093d1f6b9cbd64e0c564823222e7 | |
| parent | 802d30d9b71a6d54ef5fd1278ab4858b2e76e750 (diff) | |
| parent | ddfb87724265f5926abd2469d9f7cbc3893e71a8 (diff) | |
| download | tor-db96d1b6b09afd616922723eb88be35f2f4b4fc1.tar.gz tor-db96d1b6b09afd616922723eb88be35f2f4b4fc1.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -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 bba29f5549..218de2949b 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.3.0.8]) +AC_INIT([tor],[0.3.0.8-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 a2f261de9b..010d3906f3 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.3.0.8" +!define VERSION "0.3.0.8-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 97934050dd..231da06ed0 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.3.0.8" +#define VERSION "0.3.0.8-dev" |