[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit 461a0de3ca04ee8e0f70c040e6d4f3b063150f34
Merge: bb8c4e6 b117a06
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 25 14:09:35 2015 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)