commit bfa7d5c8e2974d5ae76830692aac5a2602f0e829 Merge: e379733 8e2ec74 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 10 16:17:47 2011 -0400

Merge branch 'bug3212'

src/test/integration_test/alpha | 43 ++++++++++++++++++ src/test/integration_test/int_test.sh | 76 +++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 0 deletions(-)