aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-08 09:29:49 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-08 09:29:49 -0400
commit6937ec7857d6a59045de31eb195325edc4b789ee (patch)
treed88c31f1d2b0399276ceac38b607eef12d4dd646 /src
parent2b34b2323aa9b7ca30c5f70b39c59145296f9f08 (diff)
parentb796ad0300d1b023bc38e5a1498b47bc2e680eae (diff)
downloadtor-6937ec7857d6a59045de31eb195325edc4b789ee.tar.gz
tor-6937ec7857d6a59045de31eb195325edc4b789ee.zip
Merge branch 'maint-0.2.6' into release-0.2.6
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 396149cb28..22a9d666c5 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -232,7 +232,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.6.11"
+#define VERSION "0.2.6.12"
#define HAVE_STRUCT_SOCKADDR_IN6