summaryrefslogtreecommitdiff
path: root/src/feature/dirclient/dirclient_modes.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-02-24 13:55:21 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-02-24 13:55:21 -0500
commit6ea7eb58c697d9e02090f63687803e921bc7c13f (patch)
tree3e597aae5010770b858753cabe69cb4c206f5f84 /src/feature/dirclient/dirclient_modes.c
parent97e51dd01b228ecb72c912c6cf3ffae6334c8d07 (diff)
parent39d0f69dfee86c4f8703094990d3169fb20614f3 (diff)
downloadtor-6ea7eb58c697d9e02090f63687803e921bc7c13f.tar.gz
tor-6ea7eb58c697d9e02090f63687803e921bc7c13f.zip
Merge branch 'tor-gitlab/mr/321' into maint-0.4.5
Diffstat (limited to 'src/feature/dirclient/dirclient_modes.c')
-rw-r--r--src/feature/dirclient/dirclient_modes.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/feature/dirclient/dirclient_modes.c b/src/feature/dirclient/dirclient_modes.c
index 62cdad6c36..db25196213 100644
--- a/src/feature/dirclient/dirclient_modes.c
+++ b/src/feature/dirclient/dirclient_modes.c
@@ -45,14 +45,6 @@ dirclient_fetches_from_authorities(const or_options_t *options)
return 1;
if (options->BridgeRelay == 1)
return 0;
- /* We don't know our IP address; ask an authority. IPv4 is still mandatory
- * to have thus if we don't have it, we ought to learn it from an authority
- * through the NETINFO cell or the HTTP header it sends us back.
- *
- * Note that at the moment, relay do a direct connection so no NETINFO cell
- * for now. */
- if (server_mode(options) && !relay_has_address_set(AF_INET))
- return 1;
refuseunknown = ! router_my_exit_policy_is_reject_star() &&
should_refuse_unknown_exits(options);
if (!dir_server_mode(options) && !refuseunknown)