diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:57:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:57:08 -0400 |
| commit | c1237ed5161ca6397592ba3da3520bf8af6f23f9 (patch) | |
| tree | 406093297e483594464f22f3d1f1fd73f02bcf3e /configure.ac | |
| parent | 5a4caad88d2d5298d7f19c21f0c885c4dfdffe97 (diff) | |
| parent | 3a5d4d666ed9b6faa8d7f4ef58d5a2ff12375d89 (diff) | |
| download | tor-c1237ed5161ca6397592ba3da3520bf8af6f23f9.tar.gz tor-c1237ed5161ca6397592ba3da3520bf8af6f23f9.zip | |
Merge branch 'maint-0.2.5' into release-0.2.5
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5372943c7b..29ba2fd6ce 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.11]) +AC_INIT([tor],[0.2.5.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE |