aboutsummaryrefslogtreecommitdiff
path: root/src/feature/dirauth/dirvote.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/feature/dirauth/dirvote.c')
-rw-r--r--src/feature/dirauth/dirvote.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index ffaa78b997..fa906c0c3c 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -4800,16 +4800,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));