diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-11-05 10:35:08 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-11-05 10:35:08 -0400 |
| commit | 47adba879ca215ef1cd5abae93a32e17063eccb2 (patch) | |
| tree | 6f731289d34f97dfef8270311d453f404ce7776b /src/feature | |
| parent | 40e21060312ebcd0ff5ab4db5fc22f93bed474de (diff) | |
| parent | 439e17180c362962abfdf2301dddbdaa323df24a (diff) | |
| download | tor-47adba879ca215ef1cd5abae93a32e17063eccb2.tar.gz tor-47adba879ca215ef1cd5abae93a32e17063eccb2.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.5
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 7d83d105b1..f2032d71f6 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4782,16 +4782,14 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, v3_out->client_versions = client_versions; v3_out->server_versions = server_versions; - /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = - tor_strdup(DIRVOTE_RECOMMEND_RELAY_PROTO); + tor_strdup(protover_get_recommended_relay_protocols()); v3_out->recommended_client_protocols = - tor_strdup(DIRVOTE_RECOMMEND_CLIENT_PROTO); - - v3_out->required_relay_protocols = - tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO); + tor_strdup(protover_get_recommended_client_protocols()); v3_out->required_client_protocols = - tor_strdup(DIRVOTE_REQUIRE_CLIENT_PROTO); + tor_strdup(protover_get_required_client_protocols()); + v3_out->required_relay_protocols = + tor_strdup(protover_get_required_relay_protocols()); /* We are not allowed to vote to require anything we don't have. */ tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL)); |