diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-08 11:39:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-08 11:39:48 -0500 |
| commit | 58474f7bb1e13ca61a0e52f13d8502cc334813bb (patch) | |
| tree | 7c28e4b4177f5bfa79848a688ac0b5cb0804d2e1 | |
| parent | 5ff2d8d7706f1f1d7790185b76ddfc8a7c575e01 (diff) | |
| parent | 1f7f930f9ef27a5fd289df23695df97d0fe262b7 (diff) | |
| download | tor-58474f7bb1e13ca61a0e52f13d8502cc334813bb.tar.gz tor-58474f7bb1e13ca61a0e52f13d8502cc334813bb.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -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 1bd782eb80..85935364d3 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.2.8-rc-dev]) +AC_INIT([tor],[0.3.2.9]) 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 0f276b49e8..dab94917ad 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.2.8-rc-dev" +!define VERSION "0.3.2.9" !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 133ebf4e39..36a2d69152 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.2.8-rc-dev" +#define VERSION "0.3.2.9" |