Don't complain that "your server has not managed to confirm that its

ports are reachable" if we haven't been able to build any circuits
yet. Bug found by spending four hours without a v3 consensus.

svn:r12133

diff --git a/ChangeLog b/ChangeLog
index a0f33ed5ef2460542d6e6cf53ca7045bad5cf211..4ad8720609c44e5903edc3f23f15a7bbc73c59ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -106,6 +106,9 @@ Changes in version 0.2.0.9-alpha - 2007-10-??
     - Don't try to download extrainfo documents when we're trying to
       fetch enough directory info to build a circuit: having enough
       info should get priority.
+    - Don't complain that "your server has not managed to confirm that its
+      ports are reachable" if we haven't been able to build any circuits
+      yet. Bug found by spending four hours without a v3 consensus.
 
   o Minor bugfixes (performance):
     - Base64 decoding was actually showing up on our profile when parsing

diff --git a/src/or/main.c b/src/or/main.c
index c3bb3c3f6f0e89a60aeff0523f5706a48092a1bd..3c0b4ae4306268434dde09e2c8fe65441fedaae0 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1153,6 +1153,7 @@ second_elapsed_callback(int fd, short event, void *args)
   if (server_mode(options) &&
       !we_are_hibernating() &&
       seconds_elapsed > 0 &&
+      has_completed_circuit &&
       stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT !=
       (stats_n_seconds_working+seconds_elapsed) /
         TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {