diff options
| author | Roger Dingledine <arma@torproject.org> | 2019-02-20 10:36:54 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2019-02-20 10:36:54 -0500 |
| commit | 4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb (patch) | |
| tree | f8603e1135590293e152f112f43b2cfec0f2ff96 /src | |
| parent | 6927e9a60ca12fa67d6a33044c2903ce95ca1605 (diff) | |
| parent | ccab4347e592116fcbc0faa42dcfaf7eaa6fe715 (diff) | |
| download | tor-4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb.tar.gz tor-4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb.zip | |
Merge branch 'maint-0.4.0'
Diffstat (limited to 'src')
| -rw-r--r-- | src/feature/nodelist/networkstatus.c | 2 | ||||
| -rw-r--r-- | src/test/test_util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 2c34754621..023115978c 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1743,7 +1743,7 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, #endif /* defined(TOR_UNIT_TESTS) */ /** - * Helper: Read a the current consensus of type <b>flavor</b> from + * Helper: Read the current consensus of type <b>flavor</b> from * <b>fname</b>. Flags and return values are as for * networkstatus_set_current_consensus(). **/ diff --git a/src/test/test_util.c b/src/test/test_util.c index 913c5e289d..7a2708c541 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6360,6 +6360,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(get_unquoted_path, 0), UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), - UTIL_TEST(map_anon_nofork, 0), + UTIL_TEST(map_anon_nofork, TT_SKIP /* See bug #29535 */), END_OF_TESTCASES }; |