summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-25 14:09:35 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-25 14:09:35 -0400
commit461a0de3ca04ee8e0f70c040e6d4f3b063150f34 (patch)
tree1e337f2feb2c88d2d396867d655e241371d67910
parentbb8c4e69ca5c8bcad7d66b2ad502ab35b1a5032b (diff)
parentb117a06784b6e00fb929465e44e520494ac0c617 (diff)
downloadtor-461a0de3ca04ee8e0f70c040e6d4f3b063150f34.tar.gz
tor-461a0de3ca04ee8e0f70c040e6d4f3b063150f34.zip
Merge branch 'maint-0.2.6' into release-0.2.6
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index e57588144a..5ea7708f7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.6.6])
+AC_INIT([tor],[0.2.6.6-dev])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE