diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-20 10:30:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-20 10:30:58 -0400 |
| commit | 1f5b228ee89f237fa653313fb1824b60a717441f (patch) | |
| tree | 13043878c3bbf7987a2034bb85132e27f6a549f7 | |
| parent | a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5 (diff) | |
| parent | fed78bce8bc645866578a1739a10ee598bbaf4e0 (diff) | |
| download | tor-1f5b228ee89f237fa653313fb1824b60a717441f.tar.gz tor-1f5b228ee89f237fa653313fb1824b60a717441f.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
Conflicts:
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 1ccc1e728b..1e578cd4a0 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -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" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c866bbb2c8..d3f3eb19ad 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -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" |