summaryrefslogtreecommitdiff
path: root/src/win32/orconfig.h
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2009-11-15 10:37:48 +0100
committerPeter Palfrader <peter@palfrader.org>2009-11-15 10:37:48 +0100
commit6d01081fb39ba4dac41beaf934510591331caac6 (patch)
treec7b1b731c91b27b32f17e5330b91f6b5c2de0131 /src/win32/orconfig.h
parent1b2b8ef88188d89e74f0ec3c6b77f2cb4d1dfc18 (diff)
parent0165f2765f73fbe585c01dce82d7b10417237836 (diff)
downloadtor-6d01081fb39ba4dac41beaf934510591331caac6.tar.gz
tor-6d01081fb39ba4dac41beaf934510591331caac6.zip
Merge branch 'debian-merge' into debian
* debian-merge: New upstream version fix compile on windows bump to 0.2.2.5-alpha Move dizum to an alternate IP address. Ship test.h in release
Diffstat (limited to 'src/win32/orconfig.h')
-rw-r--r--src/win32/orconfig.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index b128862a25..fcd3be497c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -226,5 +226,5 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.2.4-alpha"
+#define VERSION "0.2.2.5-alpha"