diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-13 12:52:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-13 12:52:44 -0500 |
| commit | 579808d4cdc62346fffa364900d0d76cfa28b3e1 (patch) | |
| tree | 510aa121c39f5a33b2d6b670ab2acc7f4079fc1f | |
| parent | cfa07f397d0e4e13337c90d73706d81cdcbc3428 (diff) | |
| parent | 52bf1556b18a3af0d7d4f612cd27e956353bf5b5 (diff) | |
| download | tor-579808d4cdc62346fffa364900d0d76cfa28b3e1.tar.gz tor-579808d4cdc62346fffa364900d0d76cfa28b3e1.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Conflicts:
src/config/geoip
| -rw-r--r-- | src/config/geoip | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/config/geoip b/src/config/geoip index e167a983d2..7b7055b2e3 100644 --- a/src/config/geoip +++ b/src/config/geoip @@ -1,5 +1,6 @@ # Last updated based on December 5 2012 Maxmind GeoLite Country -# See README.geoip for details on the conversion. +# Visit the following URL for details on the conversion: +# https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/README.geoip 16777216,16777471,AU 16777472,16778239,CN 16778240,16779263,AU |