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

Merge branch 'maint-0.2.7' into release-0.2.7

This commit is contained in:
Nick Mathewson 2016-08-24 10:03:58 -04:00
parent 64825357d3 f60da19211
commit 27940979b3
6 changed files with 11672 additions and 7469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug19728 Normal file
View File

@ -0,0 +1,3 @@
o Directory authority changes:
- The "Tonga" bridge authority has been retired; the new bridge
authority is "Bifroest". Closes tickets 19728 and 19690.

4
changes/geoip-august2016 Normal file
View File

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

4
changes/geoip-july2016 Normal file
View File

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

17190
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

1936
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff

4
src/or/config.c
View File

@ -869,8 +869,8 @@ static const char *default_authorities[] = {
"dizum orport=443 "
"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
"Tonga orport=443 bridge "
"82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
"Bifroest orport=443 bridge "
"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
"gabelmoo orport=443 "
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",