commit cdc64f020c926cd51b037b85b5eba5bf08d66e7d Merge: 6e8ae50 f4be34f Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 28 15:52:57 2014 -0400

Merge remote-tracking branch 'public/bug11608'

changes/bug11608 | 5 ++ src/test/bt_test.py | 4 +- src/test/ntor_ref.py | 49 +++++++++------- src/test/slownacl_curve25519.py | 31 ++++++++-- src/test/test_cmdline_args.py | 123 ++++++++++++++++++++++----------------- 5 files changed, 131 insertions(+), 81 deletions(-)