From 542b8af592edb731777207c39c02ffbeda2787b4 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Mon, 5 Jun 2006 10:01:52 +0000
Subject: [PATCH] don't tell people that the testing circuit failed if we
 already consider ourselves reachable. this just confuses them.

svn:r6546
---
 src/or/circuituse.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 9e8d410813..372649a7b8 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -602,6 +602,9 @@ circuit_testing_failed(circuit_t *circ, int at_last_hop)
     circuit_launch_by_router(CIRCUIT_PURPOSE_TESTING, me, 0, 1, 1);
   else
 #endif
+  if (server_mode(get_options()) && check_whether_orport_reachable())
+    return;
+
   log_info(LD_GENERAL,
            "Our testing circuit (to see if your ORPort is reachable) "
            "has failed. I'll try again later.");