diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-10-24 09:11:38 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-10-24 09:11:38 -0400 |
commit | 7e3d5312ede31d47777fa66d260de8f5dedf8cf1 (patch) | |
tree | c610e7df06a33259020884a60376cbc704de028a | |
parent | a574ab8e2f78e75db45521d185b1a21262489995 (diff) | |
parent | 552b620280d481ec9d5845d1c6584778545d1f85 (diff) | |
download | tor-7e3d5312ede31d47777fa66d260de8f5dedf8cf1.tar.gz tor-7e3d5312ede31d47777fa66d260de8f5dedf8cf1.zip |
Merge branch 'maint-0.2.9' into release-0.2.9
-rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
-rw-r--r-- | src/win32/orconfig.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index df657d38b1..cd414dd437 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.2.9.12-dev" +!define VERSION "0.2.9.13" !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 47992c0d89..a249ba8c57 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.2.9.12-dev" +#define VERSION "0.2.9.13" |