sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.5

This commit is contained in:
Nick Mathewson 2015-04-27 14:16:15 -04:00
parent 99d0579ff5 efae1bcef6
commit c79976bc9b
4 changed files with 4465 additions and 6869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/geoip-april2015 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.

2
changes/geoip6-april2015 Normal file
View File

@ -0,0 +1,2 @@
o Minor features:
- Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.

10061
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

1268
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff