diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 09:49:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 09:49:53 -0400 |
| commit | 0b50ca565d027606aa247a6ec7f85429f3f50543 (patch) | |
| tree | 15bfffe7b69d1b670375164fe71a453800ebcbc0 | |
| parent | eca4c39a435987aa019bdee5d5e7de70a7e96adc (diff) | |
| parent | fa38bbb7002429badade8422fd1e0b6b657dc32c (diff) | |
| download | tor-0b50ca565d027606aa247a6ec7f85429f3f50543.tar.gz tor-0b50ca565d027606aa247a6ec7f85429f3f50543.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -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 80c83d6cb7..4fc1ee13d4 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.4.7-rc-dev]) +AC_INIT([tor],[0.3.4.8]) 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 85ba107737..0e79e2abf8 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.4.7-rc-dev" +!define VERSION "0.3.4.8" !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 40c57c3876..4c7176dae6 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.4.7-rc-dev" +#define VERSION "0.3.4.8" |