summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-01-18 19:51:57 -0500
committerNick Mathewson <nickm@torproject.org>2016-01-18 19:51:57 -0500
commit83dfcfbc4a295ca52325f47291d109cd0a16ac8f (patch)
tree2b292b5eeddcdfcc6de739158a2bdea81449fd4e /src/or/main.c
parentb34c5c6b8ac0d13d5e2bda188ff038f6ff7eb4f3 (diff)
parent6094a886cf9be92d29077b428554a75c9971a2ca (diff)
downloadtor-83dfcfbc4a295ca52325f47291d109cd0a16ac8f.tar.gz
tor-83dfcfbc4a295ca52325f47291d109cd0a16ac8f.zip
Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 46c679c83c..534a6acc51 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1795,8 +1795,9 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg)
if (me && !check_whether_orport_reachable()) {
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. Please check your firewalls, ports, "
- "address, /etc/hosts file, etc.",
+ "its ORPort is reachable. Relays do not publish descriptors "
+ "until their ORPort and DirPort are reachable. Please check "
+ "your firewalls, ports, address, /etc/hosts file, etc.",
address, me->or_port);
control_event_server_status(LOG_WARN,
"REACHABILITY_FAILED ORADDRESS=%s:%d",
@@ -1808,8 +1809,9 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg)
char *address = tor_dup_ip(me->addr);
log_warn(LD_CONFIG,
"Your server (%s:%d) has not managed to confirm that its "
- "DirPort is reachable. Please check your firewalls, ports, "
- "address, /etc/hosts file, etc.",
+ "DirPort is reachable. Relays do not publish descriptors "
+ "until their ORPort and DirPort are reachable. Please check "
+ "your firewalls, ports, address, /etc/hosts file, etc.",
address, me->dir_port);
control_event_server_status(LOG_WARN,
"REACHABILITY_FAILED DIRADDRESS=%s:%d",