diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-09-14 13:22:17 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-09-14 13:22:17 -0400 |
commit | 881307dc77a7a6ff37a669c2317ab0bd691e24d1 (patch) | |
tree | 493cb3855e47f34ee7cd63bb63464c1306d6278e | |
parent | eebf93dfdc5d0ac7f21a73c1770b7780470621bc (diff) | |
parent | e468498469ebb2a676e74884a34fa017fa8ac3a4 (diff) | |
download | tor-881307dc77a7a6ff37a669c2317ab0bd691e24d1.tar.gz tor-881307dc77a7a6ff37a669c2317ab0bd691e24d1.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 32024b787d..4dc42346ab 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-dev]) +AC_INIT([tor],[0.3.0.11]) 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 e76b31bfe7..7824d02f14 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-dev" +!define VERSION "0.3.0.11" !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 6755b2b658..e81bf0c9fb 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-dev" +#define VERSION "0.3.0.11" |