diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-03 13:06:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-03 13:06:58 -0500 |
| commit | cdc49629c7d26e9806b8aa3c5a7dc80fbec9d060 (patch) | |
| tree | 4a03c7d9830abee489d0f08d0d2ce618699e41da /src/or/geoip.h | |
| parent | d03e1da232ada2e0d3a3de3dbf6885caec74e4e0 (diff) | |
| parent | 7f52dc4d03cc8b738b0c2a3896128ab38b030c52 (diff) | |
| download | tor-cdc49629c7d26e9806b8aa3c5a7dc80fbec9d060.tar.gz tor-cdc49629c7d26e9806b8aa3c5a7dc80fbec9d060.zip | |
Merge branch 'bug6852'
Conflicts:
src/or/status.c
Diffstat (limited to 'src/or/geoip.h')
| -rw-r--r-- | src/or/geoip.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/geoip.h b/src/or/geoip.h index 683ec073b2..8a3486c7ac 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -64,6 +64,7 @@ time_t geoip_bridge_stats_write(time_t now); void geoip_bridge_stats_term(void); const char *geoip_get_bridge_stats_extrainfo(time_t); char *geoip_get_bridge_stats_controller(time_t); +char *format_client_stats_heartbeat(time_t now); #endif |