commit 2810753928692ca86820f4df3b4a76caf2701d33 Merge: 9be3389 10fb339 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 15 11:01:06 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug8014 | 5 +++++ configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)