diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-21 12:44:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-21 12:44:21 -0500 |
| commit | c35d481f56284ebeafc2860eed27c9833d631983 (patch) | |
| tree | 128a9e3e4bbcb86560a93a3ddb8205e76973b7dd /src/or/dirserv.c | |
| parent | 6dc25e79b98ed5cb9f29de174878333a1175f755 (diff) | |
| parent | e2c881487cab57b1b4301560f10b4e3ff4a44167 (diff) | |
| download | tor-c35d481f56284ebeafc2860eed27c9833d631983.tar.gz tor-c35d481f56284ebeafc2860eed27c9833d631983.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c797c9aa0e..7ff37b4c62 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1033,7 +1033,8 @@ directory_fetches_from_authorities(const or_options_t *options) return 1; if (options->BridgeRelay == 1) return 0; - if (server_mode(options) && router_pick_published_address(options, &addr)<0) + if (server_mode(options) && + router_pick_published_address(options, &addr, 1) < 0) return 1; /* we don't know our IP address; ask an authority. */ refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options); |