diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:28:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:28:39 -0500 |
| commit | 2b716e85993898f6347ff1a4b904d017b4410793 (patch) | |
| tree | 078a5000c313bc805d1c3a129243a27a27dffb7a | |
| parent | f1cbb09e35b9f5fdea2aa1ebae77ed45096fc7ae (diff) | |
| parent | f2ecdeb724c68f854f00a0095a0849627fd4e17b (diff) | |
| download | tor-2b716e85993898f6347ff1a4b904d017b4410793.tar.gz tor-2b716e85993898f6347ff1a4b904d017b4410793.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 315bd2df35..10612eba25 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.12-dev]) +AC_INIT([tor],[0.3.0.13]) 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 160ef26750..bd8cf3d5c2 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.12-dev" +!define VERSION "0.3.0.13" !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 f5a7451a53..5795552a43 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.12-dev" +#define VERSION "0.3.0.13" |