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

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

This commit is contained in:
Nick Mathewson 2015-10-09 10:13:28 -04:00
parent 9aa7ebca29 fb5a858a35
commit 6ba5480bc1
4 changed files with 6520 additions and 2693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/geoip-july2015 Normal file
View File

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

3
changes/geoip-september2015 Normal file
View File

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

6668
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

2539
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff