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

Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

This commit is contained in:
Nick Mathewson 2015-06-25 11:43:17 -04:00
parent 1c1d71fe1a fd082c394b
commit 418b6f8197
4 changed files with 8560 additions and 8075 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/geoip-june2015 Normal file
View File

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

3
changes/geoip6-june2015 Normal file
View File

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

14347
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

2282
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff