diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-09 10:32:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-09 10:32:39 -0400 |
| commit | fc2d39af700f73859ab3e5fc5e627769867c89e4 (patch) | |
| tree | a35933cbb12611d67930eb8e0718b69227c80c94 | |
| parent | ddfccae79daddadad986e0e236c9970aeff159c9 (diff) | |
| parent | 0bb227d170c2ff5116f9b59a30d055eca192374a (diff) | |
| download | tor-0.3.5.11.tar.gz tor-0.3.5.11.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5tor-0.3.5.11
| -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 5f66d8c37e..24f1eeda3e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.10-dev]) +AC_INIT([tor],[0.3.5.11]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 7252e7eb76..e4af442c06 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.5.10-dev" +!define VERSION "0.3.5.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 2b21abe888..521f54192c 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.5.10-dev" +#define VERSION "0.3.5.11" |