torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source 
Conflicts:
	src/config/geoip
This commit is contained in:
Nick Mathewson
2012-12-13 12:52:44 -05:00
parent cfa07f397d 52bf1556b1
commit 579808d4cd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/geoip
+2 -1
View File
@@ -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