summaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-08-31 16:26:01 -0400
committerRoger Dingledine <arma@torproject.org>2009-08-31 16:26:01 -0400
commita225469ded4963e1197818c2fa58c079119cb309 (patch)
tree2aaf9850330fc425e584d33f0e0dd8b67eb914d9 /src/or/circuituse.c
parent0bb59f1c38eef467a353faf1a30cf93b64209a27 (diff)
parent4c297f74f79e0e3d357d20bfc584eccc758d1fd8 (diff)
downloadtor-a225469ded4963e1197818c2fa58c079119cb309.tar.gz
tor-a225469ded4963e1197818c2fa58c079119cb309.zip
Merge branch 'maint-0.2.1'
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index a2110a4da4..ee2d0bbabf 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -724,17 +724,12 @@ circuit_testing_opened(origin_circuit_t *circ)
static void
circuit_testing_failed(origin_circuit_t *circ, int at_last_hop)
{
- routerinfo_t *me = router_get_my_routerinfo();
if (server_mode(get_options()) && check_whether_orport_reachable())
return;
- if (!me)
- return;
log_info(LD_GENERAL,
"Our testing circuit (to see if your ORPort is reachable) "
"has failed. I'll try again later.");
- control_event_server_status(LOG_WARN, "REACHABILITY_FAILED ORADDRESS=%s:%d",
- me->address, me->or_port);
/* These aren't used yet. */
(void)circ;