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

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

This commit is contained in:
Nick Mathewson 2014-11-24 09:19:06 -05:00
parent 0872d8e3cf 137982f955
commit 5b55778c86
4 changed files with 19153 additions and 6538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/geoip-november2014 Normal file
View File

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

3
changes/geoip6-november2014 Normal file
View File

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

20036
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

5649
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff