diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 11:10:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 11:10:20 -0400 |
| commit | 6382cd93cb99d1f5cff62bfe7759eca8a6948782 (patch) | |
| tree | db86f11cd30f2fa8314fc60bfd464ebcc3940dca /src/or/main.c | |
| parent | 49c83dd21a7fe0432ad78061f3b41f4a5919340d (diff) | |
| parent | d6a2fec05ebcc39773a2f6666e1378410c64f047 (diff) | |
| download | tor-6382cd93cb99d1f5cff62bfe7759eca8a6948782.tar.gz tor-6382cd93cb99d1f5cff62bfe7759eca8a6948782.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index fba9799a60..858d6179b0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2094,7 +2094,7 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { /* every 20 minutes, check and complain if necessary */ const routerinfo_t *me = router_get_my_routerinfo(); - if (me && !check_whether_orport_reachable()) { + if (me && !check_whether_orport_reachable(options)) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " "its ORPort is reachable. Relays do not publish descriptors " @@ -2107,7 +2107,7 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) tor_free(address); } - if (me && !check_whether_dirport_reachable()) { + if (me && !check_whether_dirport_reachable(options)) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG, "Your server (%s:%d) has not managed to confirm that its " |