diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-02 12:29:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-02 12:29:42 -0400 |
| commit | abe5b07c13bb6442c14b1b71c5df75d846095c37 (patch) | |
| tree | 204f1049c69283c6878052f8c2654925c6e806ed | |
| parent | c33db290a9d8d0f921ef8ce0f49803748b5e47e0 (diff) | |
| parent | 8925e84beb3d9916026746f282bbaacc1b886818 (diff) | |
| download | tor-abe5b07c13bb6442c14b1b71c5df75d846095c37.tar.gz tor-abe5b07c13bb6442c14b1b71c5df75d846095c37.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 5d4c815986..32024b787d 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.10]) +AC_INIT([tor],[0.3.0.10-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 b9b52d8f55..e76b31bfe7 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.10" +!define VERSION "0.3.0.10-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 8fe361415c..6755b2b658 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.10" +#define VERSION "0.3.0.10-dev" |