aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-18 12:01:56 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-18 12:01:56 -0500
commit715f104eebac8d35d9cd7a404ac9924e9d623774 (patch)
tree0664d51ccae6c5f584bb53c16afafee6a8ff4006 /contrib
parent0bd6cb31edbd33764c8d24dc3e79b8a7ca9eba84 (diff)
parent4a3bd153c0c181a1b478ead9efef3d5c0dbbb849 (diff)
downloadtor-715f104eebac8d35d9cd7a404ac9924e9d623774.tar
tor-715f104eebac8d35d9cd7a404ac9924e9d623774.tar.gz
Merge remote branch 'origin/maint-0.2.1'
Conflicts: ChangeLog configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
Diffstat (limited to 'contrib')
-rw-r--r--contrib/tor-mingw.nsi.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 2390e4a57..0f7f669c2 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -8,6 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
+
!define VERSION "0.2.2.8-alpha-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"