diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:25:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:25:12 -0400 |
| commit | 695425db0c9b44b52e7ee456684f79b0ca35d12e (patch) | |
| tree | 4bab65b5cf1356607fccaa10b23b09c6df25c876 | |
| parent | 1fbd1e526c97347b867e8c3a0851355f65d6e7cd (diff) | |
| parent | 8324631dd99dc2ec801b3c631aa6930aea8e608b (diff) | |
| download | tor-695425db0c9b44b52e7ee456684f79b0ca35d12e.tar.gz tor-695425db0c9b44b52e7ee456684f79b0ca35d12e.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 c4d6bb19d3..4c82638209 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.6-dev]) +AC_INIT([tor],[0.3.0.7]) 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 b26c88b811..1ea622ffb9 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.6-dev" +!define VERSION "0.3.0.7" !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 40781c7bfa..120fa21400 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.6-dev" +#define VERSION "0.3.0.7" |