diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-27 10:03:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-27 10:03:11 -0400 |
| commit | fa1890e97f19a444f8103c1207d7d18c02887b1f (patch) | |
| tree | de250beb9bd6b271f9dc70c47288644fe3e54811 /src/test | |
| parent | 0ef432d4577790b36bd7945c51382271ce0d2105 (diff) | |
| parent | 0941c8bfe6f34024153ae3ed67e4b1a05f9a6bfe (diff) | |
| download | tor-fa1890e97f19a444f8103c1207d7d18c02887b1f.tar.gz tor-fa1890e97f19a444f8103c1207d7d18c02887b1f.zip | |
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_hs.c | 1 | ||||
| -rw-r--r-- | src/test/test_hs_common.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 9189bb65be..64448de510 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -361,6 +361,7 @@ test_pick_tor2web_rendezvous_node(void *arg) /* Parse Tor2webRendezvousPoints as a routerset. */ options->Tor2webRendezvousPoints = routerset_new(); + options->UseMicrodescriptors = 0; retval = routerset_parse(options->Tor2webRendezvousPoints, tor2web_rendezvous_str, "test_tor2web_rp"); diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 8c273c9639..17ba11ca7d 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -305,7 +305,8 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, node_t *node = node_get_mutable_by_id(ri->cache_info.identity_digest); tt_assert(node); node->rs = rs; - /* We need this to exist for node_has_descriptor() to return true. */ + /* We need this to exist for node_has_preferred_descriptor() to return + * true. */ node->md = tor_malloc_zero(sizeof(microdesc_t)); /* Do this now the nodelist_set_routerinfo() function needs a "rs" to set * the indexes which it doesn't have when it is called. */ |