diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-06-04 09:02:25 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-06-04 09:02:25 +0000 |
| commit | b8bde32c3a906ec58a3b37f6e49275a1a8a2d40a (patch) | |
| tree | bf5e406434cfb84c734b3b6b022304fd5783f809 /src/or/or.h | |
| parent | c6b3cf4b968f65312a1e52aed53b7256a097ca2b (diff) | |
| download | tor-b8bde32c3a906ec58a3b37f6e49275a1a8a2d40a.tar tor-b8bde32c3a906ec58a3b37f6e49275a1a8a2d40a.tar.gz | |
forward-port r14934
svn:r14936
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 126ab874b..bcb319ee3 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3294,7 +3294,8 @@ int dnsserv_launch_request(const char *name, int is_reverse); #ifdef GEOIP_PRIVATE int geoip_parse_entry(const char *line); #endif -int geoip_load_file(const char *filename); +int should_record_bridge_info(or_options_t *options); +int geoip_load_file(const char *filename, or_options_t *options); int geoip_get_country_by_ip(uint32_t ipaddr); int geoip_get_n_countries(void); const char *geoip_get_country_name(int num); |