sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.4' into release-0.2.4 

Conflicts:
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h
This commit is contained in:
Nick Mathewson 2014-10-20 10:30:58 -04:00
parent a8d6eb30b8 fed78bce8b
commit 1f5b228ee8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/tor-mingw.nsi.in
View File

@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
!define VERSION "0.2.4.25"
!define VERSION "0.2.4.25-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"

2
src/win32/orconfig.h
View File

@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
#define VERSION "0.2.4.25"
#define VERSION "0.2.4.25-dev"