diff options
| author | Linus Nordberg <linus@torproject.org> | 2012-10-17 12:13:49 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2012-10-17 12:13:49 +0200 |
| commit | 74c6dafed63a3e51441dd484d652c0e337585949 (patch) | |
| tree | 9948935620802fcde87bd16565df62df10cb9249 /src/or/routerset.c | |
| parent | 19ab7b16396804694355923b2254a8e10970f9b2 (diff) | |
| download | tor-74c6dafed63a3e51441dd484d652c0e337585949.tar tor-74c6dafed63a3e51441dd484d652c0e337585949.tar.gz | |
Two changes lost in rebase resurrected.
Diffstat (limited to 'src/or/routerset.c')
| -rw-r--r-- | src/or/routerset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerset.c b/src/or/routerset.c index 263cf79d7..f3cd592ae 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -216,7 +216,7 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, return 3; if (set->countries) { if (country < 0 && addr) - country = geoip_get_country_by_ip(tor_addr_to_ipv4h(addr)); + country = geoip_get_country_by_addr(addr); if (country >= 0 && country < set->n_countries && bitarray_is_set(set->countries, country)) |