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:
commit
1f5b228ee8
|
@ -8,7 +8,7 @@
|
||||||
!include "LogicLib.nsh"
|
!include "LogicLib.nsh"
|
||||||
!include "FileFunc.nsh"
|
!include "FileFunc.nsh"
|
||||||
!insertmacro GetParameters
|
!insertmacro GetParameters
|
||||||
!define VERSION "0.2.4.25"
|
!define VERSION "0.2.4.25-dev"
|
||||||
!define INSTALLER "tor-${VERSION}-win32.exe"
|
!define INSTALLER "tor-${VERSION}-win32.exe"
|
||||||
!define WEBSITE "https://www.torproject.org/"
|
!define WEBSITE "https://www.torproject.org/"
|
||||||
!define LICENSE "LICENSE"
|
!define LICENSE "LICENSE"
|
||||||
|
|
|
@ -241,7 +241,7 @@
|
||||||
#define USING_TWOS_COMPLEMENT
|
#define USING_TWOS_COMPLEMENT
|
||||||
|
|
||||||
/* Version number of package */
|
/* Version number of package */
|
||||||
#define VERSION "0.2.4.25"
|
#define VERSION "0.2.4.25-dev"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue