diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-16 09:54:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-16 09:54:13 -0500 |
| commit | bd71e0a0c8ccf684c40201f08c456596eac60887 (patch) | |
| tree | 5b33cdf7ee6ad33cd95499cff7e4e53b56c1559f /src/or/status.c | |
| parent | c67adddacb56f90d77786820f29ca2b4b9f91cae (diff) | |
| parent | 2bcd264a28e2d6bec1e806e779bf82435c9c7505 (diff) | |
| download | tor-bd71e0a0c8ccf684c40201f08c456596eac60887.tar.gz tor-bd71e0a0c8ccf684c40201f08c456596eac60887.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
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 f7be41e412..52763a7042 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -27,6 +27,7 @@ #include "hibernate.h" #include "rephist.h" #include "statefile.h" +#include "dos.h" static void log_accounting(const time_t now, const or_options_t *options); #include "geoip.h" @@ -145,6 +146,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); |