diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 15:13:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 15:13:59 -0400 |
| commit | e14da02ed09dafef289a3494ba1f58b7b7580b5f (patch) | |
| tree | 71e9b18d541b1ed73d5f161d8a9d1fe2c5b73372 | |
| parent | 2810451265e4650a31bbfa345ae96c0e959b990f (diff) | |
| parent | cff7cb858b2dfaacb0138bbe4637a80b58147f6a (diff) | |
| download | tor-e14da02ed09dafef289a3494ba1f58b7b7580b5f.tar.gz tor-e14da02ed09dafef289a3494ba1f58b7b7580b5f.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 9d30c33c35..47dd53034a 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.9-dev]) +AC_INIT([tor],[0.3.3.10]) 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 973ede1c01..5ecf208357 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-dev" +!define VERSION "0.3.3.10" !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 8837cfce31..08f0048cb2 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-dev" +#define VERSION "0.3.3.10" |