summaryrefslogtreecommitdiff
path: root/contrib/tor-mingw.nsi.in
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-01-19 14:51:39 -0500
committerRoger Dingledine <arma@torproject.org>2010-01-19 14:51:39 -0500
commit37ca182c7e2b3db60b499cc9c3c13d1843f657eb (patch)
tree2b016623d58f708ad4b9d77ec71af45ad5937279 /contrib/tor-mingw.nsi.in
parent4728bd904f2b64fe183a068e5fb1be00ee5e6008 (diff)
parentf43f87db5b945ea86cfb2bce316b46eb6fd9affd (diff)
downloadtor-37ca182c7e2b3db60b499cc9c3c13d1843f657eb.tar.gz
tor-37ca182c7e2b3db60b499cc9c3c13d1843f657eb.zip
Merge branch 'maint-0.2.1' into master
Conflicts: ChangeLog configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
Diffstat (limited to 'contrib/tor-mingw.nsi.in')
-rw-r--r--contrib/tor-mingw.nsi.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 2a1d8e0041..94fbf600a4 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -8,7 +8,6 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-
!define VERSION "0.2.2.6-alpha-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"