commit 95c34399cfb66a46371562f1532e8aa396243876 Merge: 69f66b9 31a6b4e Author: Nick Mathewson nickm@torproject.org Date: Wed May 15 14:35:37 2013 -0400

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

src/test/test.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)