summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-30 12:28:39 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-30 12:28:39 -0500
commit4902cfcf19a8c529bc43f9bb4c170ed3b9680bf6 (patch)
treefff7d7e4a3c346e716f8ac151f5b723c435dad58 /src
parent6d0f332a2efe9d9493627081e02a1983d32c15a0 (diff)
parent6bda6777c1e86a54dedafd1fadd6142b1ff4955a (diff)
downloadtor-4902cfcf19a8c529bc43f9bb4c170ed3b9680bf6.tar.gz
tor-4902cfcf19a8c529bc43f9bb4c170ed3b9680bf6.zip
Merge branch 'maint-0.2.5' into release-0.2.5
Diffstat (limited to 'src')
-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 5ba3ec1945..87ba1f11a3 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.5.15-dev"
+#define VERSION "0.2.5.16"