commit c0835f8e75bf23497971b860742d019f39834c58 Merge: bafae04 e616f5b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 18 01:16:22 2014 +0000 Merge remote-tracking branch 'origin/maint-0.2.4' configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)