aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-24 09:10:42 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-24 09:10:42 -0400
commit0ad7317107ce176bb2221f3d3128ec4b9c3e7bbc (patch)
tree7f9a549abcb79cac7817bcddb981f9b5c586dd00
parent2244838ec06260fade1dadf76c845c40b441df11 (diff)
parent302b5f577dc0840fd9f738d160ef14b88a71b67f (diff)
downloadtor-0ad7317107ce176bb2221f3d3128ec4b9c3e7bbc.tar.gz
tor-0ad7317107ce176bb2221f3d3128ec4b9c3e7bbc.zip
Merge branch 'maint-0.3.0' into release-0.3.0
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 3f36da7393..60d4cc7840 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11-dev])
+AC_INIT([tor],[0.3.0.12])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])