diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-07 11:55:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-07 11:55:17 -0400 |
| commit | 07ab483e62457ee56187037304f25ec50cb0850a (patch) | |
| tree | dc11e627e0c2ef4ce9338b6468e901815e87039d /src/or/geoip.h | |
| parent | 09759a66eae044e640f477ebe96b1c3edbb98c94 (diff) | |
| parent | 118d8ffdcb74137a36d22928ce6f46897809391e (diff) | |
| download | tor-07ab483e62457ee56187037304f25ec50cb0850a.tar.gz tor-07ab483e62457ee56187037304f25ec50cb0850a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/geoip.h')
| -rw-r--r-- | src/or/geoip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/geoip.h b/src/or/geoip.h index 1a8baae416..02228eab3e 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -52,7 +52,7 @@ void geoip_bridge_stats_init(time_t now); time_t geoip_bridge_stats_write(time_t now); void geoip_bridge_stats_term(void); const char *geoip_get_bridge_stats_extrainfo(time_t); -const char *geoip_get_bridge_stats_controller(time_t); +char *geoip_get_bridge_stats_controller(time_t); #endif |