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

Merge branch 'maint-0.2.4' into release-0.2.4

This commit is contained in:
Roger Dingledine 2014-07-21 14:39:48 -04:00
parent 9959bc54e1 75501dbe4a
commit 2998d384ec
5 changed files with 19288 additions and 10558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/geoip-july2014 Normal file
View File

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

2
changes/geoip6-july2014 Normal file
View File

@ -0,0 +1,2 @@
o Minor features:
- Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.

2
changes/geoip6-june2014 Normal file
View File

@ -0,0 +1,2 @@
o Minor features:
- Update geoip and geoip6 to the June 4 2014 Maxmind GeoLite2 Country database.

24712
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

5127
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff