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:
Nick Mathewson 2016-07-05 12:25:03 -04:00
parent ef996c91b8 7ae34e722a
commit fd6ba23f7b
4 changed files with 3527 additions and 1194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/geoip-jun2016 Normal file
View File

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

3349
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

1366
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff

2
src/or/config.c
View File

@ -802,8 +802,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
"dannenberg orport=443 no-v2 "
"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
"urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
"maatuska orport=80 no-v2 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",