diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-11-09 17:14:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-11-09 17:14:58 -0500 |
| commit | 73b1d93d757840a7162dc04a0caa691d03e17b37 (patch) | |
| tree | 127dce24f2b9e571bfb7166907dae0b30d023ac0 | |
| parent | 412da7c85cd3ef8682f8b569bce2f640f8761b7a (diff) | |
| parent | 665083be9f7eabb4f18b78d09bf4b432eddf390c (diff) | |
| download | tor-73b1d93d757840a7162dc04a0caa691d03e17b37.tar.gz tor-73b1d93d757840a7162dc04a0caa691d03e17b37.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -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 f30a7efa91..e7b1bc4d94 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.11-dev]) +AC_INIT([tor],[0.3.5.12]) 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 638754153b..374a503698 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.11-dev" +!define VERSION "0.3.5.12" !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 ec7a5b2429..5d2d321caf 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.11-dev" +#define VERSION "0.3.5.12" |