Skip to content
Snippets Groups Projects
Commit 579808d4 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

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

Conflicts:
	src/config/geoip
parents cfa07f39 52bf1556
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
src/config/geoip
+ 2
− 1
View file @ 579808d4
# 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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment