diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-06 15:42:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-06 15:42:53 -0500 |
| commit | e36faeec1d40e1f4f7ae54c798ad4492f86f594c (patch) | |
| tree | e2a61fc6d4fcb09fa6aeb1db652f9575e816acea /src/test | |
| parent | b3bc8712140b8268cb3714b17b9678eefe66e90e (diff) | |
| parent | e0c3de40ad557be4ed059e93695391e44aa7a16c (diff) | |
| download | tor-e36faeec1d40e1f4f7ae54c798ad4492f86f594c.tar.gz tor-e36faeec1d40e1f4f7ae54c798ad4492f86f594c.zip | |
Merge remote-tracking branch 'sebastian/bug13993'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test.c | 3 | ||||
| -rw-r--r-- | src/test/test_dir.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test.c b/src/test/test.c index 7995af3c69..78932a4b7a 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -106,7 +106,8 @@ test_onion_handshake(void *arg) /* client handshake 2 */ memset(c_keys, 0, 40); - tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); + tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, + 40, NULL)); tt_mem_op(c_keys,OP_EQ, s_keys, 40); memset(s_buf, 0, 40); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 849bbdbef6..a949f5de73 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3079,7 +3079,6 @@ test_dir_packages(void *arg) ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); - res = compute_consensus_package_lines(votes); tt_assert(res); tt_str_op(res, ==, |