diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-09 15:18:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-09 15:18:09 -0400 |
| commit | 81b5483ee6167f8ea176ca33fa9c8deed684fb32 (patch) | |
| tree | 6f5d61d6dfcff7f390fc097c20871ac741480427 | |
| parent | 99f9816efa08ab83f90a307ea41844d693488fde (diff) | |
| parent | f5e3bcb60b5498532b391df112dddc53f83a0ade (diff) | |
| download | tor-81b5483ee6167f8ea176ca33fa9c8deed684fb32.tar.gz tor-81b5483ee6167f8ea176ca33fa9c8deed684fb32.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -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 9b3fb0a531..2fda2ef6f3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.3.8]) +AC_INIT([tor],[0.3.3.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 a86b5cf3f6..973ede1c01 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.3.8" +!define VERSION "0.3.3.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 e66ab2b658..8837cfce31 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.3.8" +#define VERSION "0.3.3.8-dev" |