summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-15 11:07:06 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-15 11:07:06 -0400
commitf11c269ed690b2197bad6285d614fe161a0a03bc (patch)
treeff0ad41a2bf440ea350ca0cad2f79f9bec9054a0
parent600744b4be3d83a3e4924c8712bc30b7de1f4d3c (diff)
parentce3b553926ab13a59963890db93aa9d33b830f95 (diff)
downloadtor-f11c269ed690b2197bad6285d614fe161a0a03bc.tar.gz
tor-f11c269ed690b2197bad6285d614fe161a0a03bc.zip
Merge remote-tracking branch 'asn-mytor/heartbeat'
-rw-r--r--src/or/status.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/status.c b/src/or/status.c
index 3a51c8b0a7..34a27b2edd 100644
--- a/src/or/status.c
+++ b/src/or/status.c
@@ -85,10 +85,9 @@ log_heartbeat(time_t now)
const node_t *myself;
or_options_t *options = get_options();
- int is_server = server_mode(options);
(void)now;
- if (is_server) {
+ if (public_server_mode(options)) {
/* Let's check if we are in the current cached consensus. */
if (!(me = router_get_my_routerinfo()))
return -1; /* Something stinks, we won't even attempt this. */