diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-01-30 09:33:12 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-01-30 09:33:12 -0500 |
| commit | cd81403cc0d73d53cb7f3650b38d49c54100af25 (patch) | |
| tree | 5ea4f0c626ad082fb195a478614f67dff1a7b386 /src/or/status.c | |
| parent | 03ab24b44cd148263cfb2b801cba35489e3852c1 (diff) | |
| parent | 9aca7d47306222f2870ec16a7291a8215d6c3316 (diff) | |
| download | tor-cd81403cc0d73d53cb7f3650b38d49c54100af25.tar.gz tor-cd81403cc0d73d53cb7f3650b38d49c54100af25.zip | |
Merge branch 'ticket24902_029_05' into ticket24902_033_02
Diffstat (limited to 'src/or/status.c')
| -rw-r--r-- | src/or/status.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/status.c b/src/or/status.c index 187dc4ad22..3b4c605853 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -29,6 +29,7 @@ #include "statefile.h" #include "hs_stats.h" #include "hs_service.h" +#include "dos.h" static void log_accounting(const time_t now, const or_options_t *options); #include "geoip.h" @@ -167,6 +168,7 @@ log_heartbeat(time_t now) if (public_server_mode(options)) { rep_hist_log_circuit_handshake_stats(now); rep_hist_log_link_protocol_counts(); + dos_log_heartbeat(); } circuit_log_ancient_one_hop_circuits(1800); |