Merge branch 'maint-0.2.6' into release-0.2.6
This commit is contained in:
commit
461a0de3ca
|
@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
|
||||||
dnl Copyright (c) 2007-2015, The Tor Project, Inc.
|
dnl Copyright (c) 2007-2015, The Tor Project, Inc.
|
||||||
dnl See LICENSE for licensing information
|
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_SRCDIR([src/or/main.c])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
|
|
Loading…
Reference in New Issue