diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:16:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:16:15 -0400 |
| commit | 3da9a14f1c8b02215db1a14e31b6d5de4074998b (patch) | |
| tree | 3104c9b0102e78d02ba275ab76d43bb7bf6e3d9b /src/or/main.c | |
| parent | 978a2251f33416a95d5c2d8c8a844d1777d20429 (diff) | |
| parent | e964f811437290ada91b62b44efb5caf7b491da4 (diff) | |
| download | tor-3da9a14f1c8b02215db1a14e31b6d5de4074998b.tar.gz tor-3da9a14f1c8b02215db1a14e31b6d5de4074998b.zip | |
Merge remote-tracking branch 'arma/feature6758'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index f3b781ec2f..f3624f6cfb 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1562,7 +1562,8 @@ run_scheduled_events(time_t now) /** 12. write the heartbeat message */ if (options->HeartbeatPeriod && time_to_next_heartbeat <= now) { - log_heartbeat(now); + if (time_to_next_heartbeat) /* don't log the first heartbeat */ + log_heartbeat(now); time_to_next_heartbeat = now+options->HeartbeatPeriod; } } |